Update to 0.4.1

PR:		34386
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

5 files changed, 93 insertions, 87 deletions

diff --git a/print/panda/Makefile b/print/panda/Makefile
index 4a8721e5e19c..b90c8bbe3cb6 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	panda
-PORTVERSION=	0.4.p1
-PORTREVISION=	1
+PORTVERSION=	0.4.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	panda
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g:S/p/rc/}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,54 +19,26 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.p/-rc/}
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${PREFIX}/lib" \
-		LIBS="${PTHREAD_LIBS}"
-MAKE_ARGS=	NOPROFILE=true
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
-MAN3=		checkinfo.3 initpanda.3 makedate.3 nowdate.3 \
-		panda-textmodes.3 panda-xobjectmodes.3 pdfclose.3 \
-		pdfopen.3 pdfpage.3 setauthor.3 setcharacterspacing.3 \
-		setcreator.3 setfont.3 setfontmode.3 setfontsize.3 \
-		sethorizontalscaling.3 setkeywords.3 setleading.3 \
-		setsubject.3 settitle.3 setwordspacing.3
-
-DOCS=		AUTHORS BUGS CONTRIBUTORS ChangeLog \
-		DEV-HINTS README TODO UNDERWAY
-EXAMPLES=	IMAGES *.jpg *.png *.tif main.c legacymain.c
-
-post-configure:
-# GNU make doesn't have a -V option, so we have to add a shot_VARIABLE
-# target for each variable and run gmake show_VARIABLE to look it up.
-	cd ${WRKSRC} && ${PERL} -pe 's/%%(\w+)%%/ \
-		open(H, ">> Makefile"); \
-		print H "show_$$1:; \@echo \$$($$1)\n"; \
-		close(H); \
-		$$_ = `${GMAKE} show_$$1`; \
-		chomp; \
-		$$_; \
-		/eg' \
-		${FILESDIR}/BSDMakefile > ${WRKSRC}/BSDMakefile
-
-pre-build:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f BSDMakefile ${MAKE_ARGS} ${ALL_TARGET}
-
 post-install:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f BSDMakefile ${MAKE_ARGS} ${INSTALL_TARGET}
+	@${INSTALL_MAN} ${WRKSRC}/man/panda_*.3 ${MANPREFIX}/man/man3
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PORTNAME}/
+	@${MKDIR} ${DOCSDIR}
+.for f in AUTHORS CONTRIBUTORS ChangeLog DEV-HINTS README TODO UNDERWAY
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
-	${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/${PORTNAME}/
+	@${MKDIR} ${EXAMPLESDIR}
+.for f in IMAGES examples/*.c examples/images/*.*
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
 .endfor
 .endif
 
+.include "Makefile.man"
 .include <bsd.port.mk>
diff --git a/print/panda/Makefile.man b/print/panda/Makefile.man
new file mode 100644
index 000000000000..eba0b144a545
--- /dev/null
+++ b/print/panda/Makefile.man
@@ -0,0 +1,66 @@
+MAN3+=	panda_addchild.3
+MAN3+=	panda_addcubiccurvesegment.3
+MAN3+=	panda_addlinesegment.3
+MAN3+=	panda_addquadraticcurvesegmentone.3
+MAN3+=	panda_addquadraticcurvesegmenttwo.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_endline.3
+MAN3+=	panda_entergraphicsmode.3
+MAN3+=	panda_error.3
+MAN3+=	panda_exitgraphicsmode.3
+MAN3+=	panda_fillline.3
+MAN3+=	panda_freeobject.3
+MAN3+=	panda_getfontobj.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_makedate.3
+MAN3+=	panda_newobject.3
+MAN3+=	panda_newpage.3
+MAN3+=	panda_nowdate.3
+MAN3+=	panda_open.3
+MAN3+=	panda_open_actual.3
+MAN3+=	panda_open_suppress.3
+MAN3+=	panda_print.3
+MAN3+=	panda_printf.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_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_textbox.3
+MAN3+=	panda_textboxrot.3
+MAN3+=	panda_traverseobjects.3
+MAN3+=	panda_writeobject.3
+MAN3+=	panda_writetrailer.3
+MAN3+=	panda_writexref.3
+MAN3+=	panda_xmalloc.3
+MAN3+=	panda_xrealloc.3
+MAN3+=	panda_xsnprintf.3
diff --git a/print/panda/distinfo b/print/panda/distinfo
index 07db1efe0abd..7180a8dd2da0 100644
--- a/print/panda/distinfo
+++ b/print/panda/distinfo
@@ -1 +1 @@
-MD5 (panda_0_4_rc1.tgz) = 25a203277383bed7a5563fae118d9600
+MD5 (panda_0.4.1.tgz) = 8983461010659057c95c44c9cbf42d6e
diff --git a/print/panda/files/BSDMakefile b/print/panda/files/BSDMakefile
deleted file mode 100644
index 85572b3dff13..000000000000
--- a/print/panda/files/BSDMakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-LIB=		panda
-SHLIB_MAJOR?=	0
-SHLIB_MINOR?=	0
-CFLAGS+=	%%DEFS%% %%INCLUDES%% %%AM_CPPFLAGS%% %%CPPFLAGS%% %%AM_CFLAGS%%
-LDADD=		%%LDFLAGS%% %%LIBS%%
-SRCS=		%%libpanda_a_SOURCES%%
-INCS=		${LIB}/*.h
-NOMAN=		YES
-LIBDIR=		${LOCALBASE}/lib
-INCDIR=		${LOCALBASE}/include/${LIB}
-
-.include <bsd.lib.mk>
-
-# For FreeBSD 3.x or older
-.if !target(_includeinstall)
-_includeinstall:
-.if defined(INCS)
-.for header in ${INCS}
-        cd ${.CURDIR} && \
-        ${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
-                ${header} ${DESTDIR}${INCDIR}
-
-.endfor
-.endif
-
-beforeinstall: _includeinstall
-.endif
-
-_includeinstall: pre-_includeinstall
-
-pre-_includeinstall:
-	mkdir -p ${DESTDIR}${INCDIR}
diff --git a/print/panda/pkg-plist b/print/panda/pkg-plist
index 3e2e26980230..6d1691eb020c 100644
--- a/print/panda/pkg-plist
+++ b/print/panda/pkg-plist
@@ -1,28 +1,31 @@
 include/panda/constants.h
 include/panda/functions.h
-include/panda/objects.h
 include/panda/legacy.h
-@dirrm include/panda
+include/panda/objects.h
 lib/libpanda.a
 lib/libpanda.so
 lib/libpanda.so.0
 %%PORTDOCS%%share/doc/panda/AUTHORS
-%%PORTDOCS%%share/doc/panda/BUGS
 %%PORTDOCS%%share/doc/panda/CONTRIBUTORS
 %%PORTDOCS%%share/doc/panda/ChangeLog
 %%PORTDOCS%%share/doc/panda/DEV-HINTS
 %%PORTDOCS%%share/doc/panda/README
 %%PORTDOCS%%share/doc/panda/TODO
 %%PORTDOCS%%share/doc/panda/UNDERWAY
-%%PORTDOCS%%@dirrm share/doc/panda
 %%PORTDOCS%%share/examples/panda/IMAGES
-%%PORTDOCS%%share/examples/panda/brave-gnu.png
+%%PORTDOCS%%share/examples/panda/RedbrushAlpha.png
+%%PORTDOCS%%share/examples/panda/circles.c
+%%PORTDOCS%%share/examples/panda/empty.c
 %%PORTDOCS%%share/examples/panda/gnu-head.jpg
-%%PORTDOCS%%share/examples/panda/gnu-head.png
+%%PORTDOCS%%share/examples/panda/gnu.png
 %%PORTDOCS%%share/examples/panda/gnu_box.jpg
-%%PORTDOCS%%share/examples/panda/input-ms.tif
 %%PORTDOCS%%share/examples/panda/input.tif
 %%PORTDOCS%%share/examples/panda/input2.tif
 %%PORTDOCS%%share/examples/panda/legacymain.c
+%%PORTDOCS%%share/examples/panda/libpng.png
 %%PORTDOCS%%share/examples/panda/main.c
+%%PORTDOCS%%share/examples/panda/morecircles.c
+%%PORTDOCS%%share/examples/panda/template.c
+%%PORTDOCS%%@dirrm share/doc/panda
 %%PORTDOCS%%@dirrm share/examples/panda
+@dirrm include/panda