1: Stagify.

2: new syntax of LIB_DEPENDS.
3: remove NOPORTDOCS & NOPORTEXAMPLES.

3 files changed, 102 insertions, 109 deletions

diff --git a/print/panda/Makefile b/print/panda/Makefile
index 235d32f6b5bc..4dc5b12c3a89 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -15,22 +15,20 @@ COMMENT=	A PDF generation library
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
-USES=	pathfix pkgconfig gmake tar:bzip2
+USES=		pathfix pkgconfig gmake tar:bzip2
 USE_BDB=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-berkeley-db
 USE_LDCONFIG=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-extract:
 .for file in config.sub config.guess
 	@${RM} ${WRKSRC}/config/${file} && ${TOUCH} ${WRKSRC}/config/${file}
@@ -41,19 +39,14 @@ post-patch:
 		${WRKSRC}/examples/Makefile.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/panda_*.3 ${MANPREFIX}/man/man3
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/panda_*.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS CONTRIBUTORS ChangeLog DEV-HINTS README TODO UNDERWAY
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in IMAGES examples/*.c examples/c++/*.cpp examples/images/*.*
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
 
-.include "Makefile.man"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/panda/Makefile.man b/print/panda/Makefile.man
deleted file mode 100644
index 45271cd27f39..000000000000
--- a/print/panda/Makefile.man
+++ /dev/null
@@ -1,91 +0,0 @@
-MAN3+=	panda_addchild.3
-MAN3+=	panda_addcubiccurvesegment.3
-MAN3+=	panda_addlinesegment.3
-MAN3+=	panda_addquadraticcurvesegmentone.3
-MAN3+=	panda_addquadraticcurvesegmenttwo.3
-MAN3+=	panda_applytemplate.3
-MAN3+=	panda_centerwindow.3
-MAN3+=	panda_checkinfo.3
-MAN3+=	panda_close.3
-MAN3+=	panda_closeline.3
-MAN3+=	panda_closetext.3
-MAN3+=	panda_createandinsertpage.3
-MAN3+=	panda_createfont.3
-MAN3+=	panda_dbclose.3
-MAN3+=	panda_dbopen.3
-MAN3+=	panda_dbread.3
-MAN3+=	panda_dbwrite.3
-MAN3+=	panda_endline.3
-MAN3+=	panda_entergraphicsmode.3
-MAN3+=	panda_error.3
-MAN3+=	panda_exitgraphicsmode.3
-MAN3+=	panda_fillline.3
-MAN3+=	panda_fitwindow.3
-MAN3+=	panda_freeobject.3
-MAN3+=	panda_freetextannotation.3
-MAN3+=	panda_fullscreen.3
-MAN3+=	panda_getfontobj.3
-MAN3+=	panda_hexstring.3
-MAN3+=	panda_hidemenubar.3
-MAN3+=	panda_hidetoolbar.3
-MAN3+=	panda_hidewindowui.3
-MAN3+=	panda_imagebox.3
-MAN3+=	panda_imageboxrot.3
-MAN3+=	panda_init.3
-MAN3+=	panda_insertJPEG.3
-MAN3+=	panda_insertPNG.3
-MAN3+=	panda_insertTIFF.3
-MAN3+=	panda_insertannotation.3
-MAN3+=	panda_makedate.3
-MAN3+=	panda_md5hash.3
-MAN3+=	panda_newobject.3
-MAN3+=	panda_newpage.3
-MAN3+=	panda_newtemplate.3
-MAN3+=	panda_nfspagemodde.3
-MAN3+=	panda_nowdate.3
-MAN3+=	panda_open.3
-MAN3+=	panda_open_actual.3
-MAN3+=	panda_open_suppress.3
-MAN3+=	panda_pageduration.3
-MAN3+=	panda_print.3
-MAN3+=	panda_printf.3
-MAN3+=	panda_processtrans.3
-MAN3+=	panda_putc.3
-MAN3+=	panda_rectangle.3
-MAN3+=	panda_setauthor.3
-MAN3+=	panda_setcharacterspacing.3
-MAN3+=	panda_setcreator.3
-MAN3+=	panda_setfillcolor.3
-MAN3+=	panda_setfont.3
-MAN3+=	panda_setfontmode.3
-MAN3+=	panda_setfontsize.3
-MAN3+=	panda_sethorizontalscaling.3
-MAN3+=	panda_setid.3
-MAN3+=	panda_setkeywords.3
-MAN3+=	panda_setleading.3
-MAN3+=	panda_setlinecap.3
-MAN3+=	panda_setlinecolor.3
-MAN3+=	panda_setlinedashing.3
-MAN3+=	panda_setlinejoin.3
-MAN3+=	panda_setlinestart.3
-MAN3+=	panda_setlinewidth.3
-MAN3+=	panda_setobjectproperty.3
-MAN3+=	panda_setsubject.3
-MAN3+=	panda_settitle.3
-MAN3+=	panda_setwordspacing.3
-MAN3+=	panda_streamprintf.3
-MAN3+=	panda_strokeline.3
-MAN3+=	panda_textannotation.3
-MAN3+=	panda_textbox.3
-MAN3+=	panda_textboxrot.3
-MAN3+=	panda_textdirection.3
-MAN3+=	panda_transduration.3
-MAN3+=	panda_transstyle.3
-MAN3+=	panda_traverseobjects.3
-MAN3+=	panda_writeobject.3
-MAN3+=	panda_writetrailer.3
-MAN3+=	panda_writexref.3
-MAN3+=	panda_xfree.3
-MAN3+=	panda_xmalloc.3
-MAN3+=	panda_xrealloc.3
-MAN3+=	panda_xsnprintf.3
diff --git a/print/panda/pkg-plist b/print/panda/pkg-plist
index 4cf73b98e913..5c79e32ba3f7 100644
--- a/print/panda/pkg-plist
+++ b/print/panda/pkg-plist
@@ -7,6 +7,97 @@ lib/libpanda.la
 lib/libpanda.so
 lib/libpanda.so.0
 libdata/pkgconfig/panda.pc
+man/man3/panda_addchild.3.gz
+man/man3/panda_addcubiccurvesegment.3.gz
+man/man3/panda_addlinesegment.3.gz
+man/man3/panda_addquadraticcurvesegmentone.3.gz
+man/man3/panda_addquadraticcurvesegmenttwo.3.gz
+man/man3/panda_applytemplate.3.gz
+man/man3/panda_centerwindow.3.gz
+man/man3/panda_checkinfo.3.gz
+man/man3/panda_close.3.gz
+man/man3/panda_closeline.3.gz
+man/man3/panda_closetext.3.gz
+man/man3/panda_createandinsertpage.3.gz
+man/man3/panda_createfont.3.gz
+man/man3/panda_dbclose.3.gz
+man/man3/panda_dbopen.3.gz
+man/man3/panda_dbread.3.gz
+man/man3/panda_dbwrite.3.gz
+man/man3/panda_endline.3.gz
+man/man3/panda_entergraphicsmode.3.gz
+man/man3/panda_error.3.gz
+man/man3/panda_exitgraphicsmode.3.gz
+man/man3/panda_fillline.3.gz
+man/man3/panda_fitwindow.3.gz
+man/man3/panda_freeobject.3.gz
+man/man3/panda_freetextannotation.3.gz
+man/man3/panda_fullscreen.3.gz
+man/man3/panda_getfontobj.3.gz
+man/man3/panda_hexstring.3.gz
+man/man3/panda_hidemenubar.3.gz
+man/man3/panda_hidetoolbar.3.gz
+man/man3/panda_hidewindowui.3.gz
+man/man3/panda_imagebox.3.gz
+man/man3/panda_imageboxrot.3.gz
+man/man3/panda_init.3.gz
+man/man3/panda_insertJPEG.3.gz
+man/man3/panda_insertPNG.3.gz
+man/man3/panda_insertTIFF.3.gz
+man/man3/panda_insertannotation.3.gz
+man/man3/panda_makedate.3.gz
+man/man3/panda_md5hash.3.gz
+man/man3/panda_newobject.3.gz
+man/man3/panda_newpage.3.gz
+man/man3/panda_newtemplate.3.gz
+man/man3/panda_nfspagemodde.3.gz
+man/man3/panda_nowdate.3.gz
+man/man3/panda_open.3.gz
+man/man3/panda_open_actual.3.gz
+man/man3/panda_open_suppress.3.gz
+man/man3/panda_pageduration.3.gz
+man/man3/panda_print.3.gz
+man/man3/panda_printf.3.gz
+man/man3/panda_processtrans.3.gz
+man/man3/panda_putc.3.gz
+man/man3/panda_rectangle.3.gz
+man/man3/panda_setauthor.3.gz
+man/man3/panda_setcharacterspacing.3.gz
+man/man3/panda_setcreator.3.gz
+man/man3/panda_setfillcolor.3.gz
+man/man3/panda_setfont.3.gz
+man/man3/panda_setfontmode.3.gz
+man/man3/panda_setfontsize.3.gz
+man/man3/panda_sethorizontalscaling.3.gz
+man/man3/panda_setid.3.gz
+man/man3/panda_setkeywords.3.gz
+man/man3/panda_setleading.3.gz
+man/man3/panda_setlinecap.3.gz
+man/man3/panda_setlinecolor.3.gz
+man/man3/panda_setlinedashing.3.gz
+man/man3/panda_setlinejoin.3.gz
+man/man3/panda_setlinestart.3.gz
+man/man3/panda_setlinewidth.3.gz
+man/man3/panda_setobjectproperty.3.gz
+man/man3/panda_setsubject.3.gz
+man/man3/panda_settitle.3.gz
+man/man3/panda_setwordspacing.3.gz
+man/man3/panda_streamprintf.3.gz
+man/man3/panda_strokeline.3.gz
+man/man3/panda_textannotation.3.gz
+man/man3/panda_textbox.3.gz
+man/man3/panda_textboxrot.3.gz
+man/man3/panda_textdirection.3.gz
+man/man3/panda_transduration.3.gz
+man/man3/panda_transstyle.3.gz
+man/man3/panda_traverseobjects.3.gz
+man/man3/panda_writeobject.3.gz
+man/man3/panda_writetrailer.3.gz
+man/man3/panda_writexref.3.gz
+man/man3/panda_xfree.3.gz
+man/man3/panda_xmalloc.3.gz
+man/man3/panda_xrealloc.3.gz
+man/man3/panda_xsnprintf.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog