- Enable stagedir support

- Add LICENSE
- Convert to new LIB_DEPENDS format
- Convert USE_GMAKE=yes -> USES=gmake
- Rename MAN option to MANPAGES
- Bump PORTREVISION to properly deal with some of the OPTION settings

3 files changed, 118 insertions, 126 deletions

diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 37febd3049be..4a2a67ce9f1d 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -3,45 +3,40 @@
 
 PORTNAME=	pslib
 PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A C-library for generating multi page PostScript documents
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LICENSE=	GPLv2
 
-USES=		pathfix pkgconfig gettext
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
+
+USES=		pathfix pkgconfig gettext gmake
 USE_GNOME=	intlhack
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	EXAMPLES MAN NLS
-OPTIONS_DEFAULT=	MAN NLS
-MAN_DESC=	Manual pages
+OPTIONS_DEFINE=	EXAMPLES MANPAGES NLS
+OPTIONS_DEFAULT=	MANPAGES NLS
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 EX_NAME=	pslib-examples-0.0.10
 EX_WRKSRC=	${WRKDIR}/${EX_NAME}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} ${EX_NAME}${EXTRACT_SUFX}
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMAN}
+.if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
 		${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils
-MAN3!=	${CAT} ${FILESDIR}/man3
 .else
 # Avoid building the manpages.
 CONFIGURE_ENV+=	ac_cv_prog_DOC_TO_MAN=""
@@ -60,11 +55,9 @@ post-patch:
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MNLS}
-	${MKDIR} -m 0755 ${EXAMPLESDIR}
+	${MKDIR} -m 0755 ${STAGEDIR}${EXAMPLESDIR}
 	@${RM} -f ${EX_WRKSRC}/Makefile.unix ${EX_WRKSRC}/ChangeLog \
 		${EX_WRKSRC}/CMakeLists.txt
-	cd ${EX_WRKSRC} && ${PAX} -rw * ${EXAMPLESDIR}
-.endif
+	cd ${EX_WRKSRC} && ${PAX} -rw * ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/print/pslib/files/man3 b/print/pslib/files/man3
deleted file mode 100644
index 9b9b9d7270bf..000000000000
--- a/print/pslib/files/man3
+++ /dev/null
@@ -1,102 +0,0 @@
-PS_add_bookmark.3
-PS_add_kerning.3
-PS_add_launchlink.3
-PS_add_ligature.3
-PS_add_locallink.3
-PS_add_note.3
-PS_add_pdflink.3
-PS_add_weblink.3
-PS_arc.3
-PS_arcn.3
-PS_begin_font.3
-PS_begin_glyph.3
-PS_begin_page.3
-PS_begin_pattern.3
-PS_begin_template.3
-PS_boot.3
-PS_circle.3
-PS_clip.3
-PS_close.3
-PS_close_image.3
-PS_closepath.3
-PS_closepath_stroke.3
-PS_continue_text.3
-PS_continue_text2.3
-PS_create_gstate.3
-PS_curveto.3
-PS_delete.3
-PS_end_font.3
-PS_end_glyph.3
-PS_end_page.3
-PS_end_pattern.3
-PS_end_template.3
-PS_fill.3
-PS_fill_stroke.3
-PS_findfont.3
-PS_free_glyph_list.3
-PS_get_buffer.3
-PS_get_majorversion.3
-PS_get_minorversion.3
-PS_get_opaque.3
-PS_get_parameter.3
-PS_get_subminorversion.3
-PS_get_value.3
-PS_glyph_list.3
-PS_glyph_show.3
-PS_hyphenate.3
-PS_include_file.3
-PS_lineto.3
-PS_list_parameters.3
-PS_list_resources.3
-PS_list_values.3
-PS_makespotcolor.3
-PS_moveto.3
-PS_new.3
-PS_new2.3
-PS_open_file.3
-PS_open_fp.3
-PS_open_image.3
-PS_open_image_file.3
-PS_open_mem.3
-PS_place_image.3
-PS_rect.3
-PS_restore.3
-PS_rotate.3
-PS_save.3
-PS_scale.3
-PS_set_border_color.3
-PS_set_border_dash.3
-PS_set_border_style.3
-PS_set_gstate.3
-PS_set_info.3
-PS_set_parameter.3
-PS_set_text_pos.3
-PS_set_value.3
-PS_setcolor.3
-PS_setdash.3
-PS_setflat.3
-PS_setfont.3
-PS_setgray.3
-PS_setlinecap.3
-PS_setlinejoin.3
-PS_setlinewidth.3
-PS_setmiterlimit.3
-PS_setpolydash.3
-PS_shading.3
-PS_shading_pattern.3
-PS_shfill.3
-PS_show.3
-PS_show2.3
-PS_show_boxed.3
-PS_show_xy.3
-PS_show_xy2.3
-PS_shutdown.3
-PS_string_geometry.3
-PS_stringwidth.3
-PS_stringwidth2.3
-PS_stroke.3
-PS_symbol.3
-PS_symbol_name.3
-PS_symbol_width.3
-PS_translate.3
-pslib.3
diff --git a/print/pslib/pkg-plist b/print/pslib/pkg-plist
index b5a89668df2f..0fa791f0facf 100644
--- a/print/pslib/pkg-plist
+++ b/print/pslib/pkg-plist
@@ -6,10 +6,109 @@ lib/libps.la
 lib/libps.so
 lib/libps.so.4
 libdata/pkgconfig/libps.pc
+man/man3/PS_add_bookmark.3.gz
+man/man3/PS_add_kerning.3.gz
+man/man3/PS_add_launchlink.3.gz
+man/man3/PS_add_ligature.3.gz
+man/man3/PS_add_locallink.3.gz
+man/man3/PS_add_note.3.gz
+man/man3/PS_add_pdflink.3.gz
+man/man3/PS_add_weblink.3.gz
+man/man3/PS_arc.3.gz
+man/man3/PS_arcn.3.gz
+man/man3/PS_begin_font.3.gz
+man/man3/PS_begin_glyph.3.gz
+man/man3/PS_begin_page.3.gz
+man/man3/PS_begin_pattern.3.gz
+man/man3/PS_begin_template.3.gz
+man/man3/PS_boot.3.gz
+man/man3/PS_circle.3.gz
+man/man3/PS_clip.3.gz
+man/man3/PS_close.3.gz
+man/man3/PS_close_image.3.gz
+man/man3/PS_closepath.3.gz
+man/man3/PS_closepath_stroke.3.gz
+man/man3/PS_continue_text.3.gz
+man/man3/PS_continue_text2.3.gz
+man/man3/PS_create_gstate.3.gz
+man/man3/PS_curveto.3.gz
+man/man3/PS_delete.3.gz
+man/man3/PS_end_font.3.gz
+man/man3/PS_end_glyph.3.gz
+man/man3/PS_end_page.3.gz
+man/man3/PS_end_pattern.3.gz
+man/man3/PS_end_template.3.gz
+man/man3/PS_fill.3.gz
+man/man3/PS_fill_stroke.3.gz
+man/man3/PS_findfont.3.gz
+man/man3/PS_free_glyph_list.3.gz
+man/man3/PS_get_buffer.3.gz
+man/man3/PS_get_majorversion.3.gz
+man/man3/PS_get_minorversion.3.gz
+man/man3/PS_get_opaque.3.gz
+man/man3/PS_get_parameter.3.gz
+man/man3/PS_get_subminorversion.3.gz
+man/man3/PS_get_value.3.gz
+man/man3/PS_glyph_list.3.gz
+man/man3/PS_glyph_show.3.gz
+man/man3/PS_hyphenate.3.gz
+man/man3/PS_include_file.3.gz
+man/man3/PS_lineto.3.gz
+man/man3/PS_list_parameters.3.gz
+man/man3/PS_list_resources.3.gz
+man/man3/PS_list_values.3.gz
+man/man3/PS_makespotcolor.3.gz
+man/man3/PS_moveto.3.gz
+man/man3/PS_new.3.gz
+man/man3/PS_new2.3.gz
+man/man3/PS_open_file.3.gz
+man/man3/PS_open_fp.3.gz
+man/man3/PS_open_image.3.gz
+man/man3/PS_open_image_file.3.gz
+man/man3/PS_open_mem.3.gz
+man/man3/PS_place_image.3.gz
+man/man3/PS_rect.3.gz
+man/man3/PS_restore.3.gz
+man/man3/PS_rotate.3.gz
+man/man3/PS_save.3.gz
+man/man3/PS_scale.3.gz
+man/man3/PS_set_border_color.3.gz
+man/man3/PS_set_border_dash.3.gz
+man/man3/PS_set_border_style.3.gz
+man/man3/PS_set_gstate.3.gz
+man/man3/PS_set_info.3.gz
+man/man3/PS_set_parameter.3.gz
+man/man3/PS_set_text_pos.3.gz
+man/man3/PS_set_value.3.gz
+man/man3/PS_setcolor.3.gz
+man/man3/PS_setdash.3.gz
+man/man3/PS_setflat.3.gz
+man/man3/PS_setfont.3.gz
+man/man3/PS_setgray.3.gz
+man/man3/PS_setlinecap.3.gz
+man/man3/PS_setlinejoin.3.gz
+man/man3/PS_setlinewidth.3.gz
+man/man3/PS_setmiterlimit.3.gz
+man/man3/PS_setpolydash.3.gz
+man/man3/PS_shading.3.gz
+man/man3/PS_shading_pattern.3.gz
+man/man3/PS_shfill.3.gz
+man/man3/PS_show.3.gz
+man/man3/PS_show2.3.gz
+man/man3/PS_show_boxed.3.gz
+man/man3/PS_show_xy.3.gz
+man/man3/PS_show_xy2.3.gz
+man/man3/PS_shutdown.3.gz
+man/man3/PS_string_geometry.3.gz
+man/man3/PS_stringwidth.3.gz
+man/man3/PS_stringwidth2.3.gz
+man/man3/PS_stroke.3.gz
+man/man3/PS_symbol.3.gz
+man/man3/PS_symbol_name.3.gz
+man/man3/PS_symbol_width.3.gz
+man/man3/PS_translate.3.gz
+man/man3/pslib.3.gz
 %%NLS%%share/locale/de/LC_MESSAGES/pslib.mo
-%%DATADIR%%/draft.ps
-%%DATADIR%%/exectime.ps
-%%DATADIR%%/grid.ps
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.afm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.enc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.pfb
@@ -62,7 +161,9 @@ libdata/pkgconfig/libps.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/showbox.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spotcolor.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/txt2ps.c
-%%PORTEXAMPLES%%
-@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/draft.ps
+%%DATADIR%%/exectime.ps
+%%DATADIR%%/grid.ps
 @dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/libps