Update to current version, remove install foo from port Makefile, use

more port variables.

PR:		35759
Submitted by:	MAINTAINER

8 files changed, 52 insertions, 32 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 75b55daa122d..23999615b240 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	pfaedit
 PORTVERSION=	20${DIST_VER}
 CATEGORIES=	print
 MASTER_SITES=	http://pfaedit.sourceforge.net/
-DISTFILES=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
+DISTFILES=	${EXTRACT_ONLY}
 .if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}_htdocs-${DOC_VER}.tgz
+DISTFILES+=	${DOCFILE}
 .endif
 
 MAINTAINER=	kanou@mil.allnet.ne.jp
@@ -30,12 +30,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	pfaedit
 
-MAN1=		pfaedit.1
+MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	020306
+DIST_VER=	020310
+EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
 DOC_VER=	020214
+DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
 DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
 		Problems-MacOSX.html accented.html bezier.html bitmapview.html \
 		charview.html cidmenu.html cliargs.html corpchar.html \
@@ -77,27 +79,30 @@ DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
 		document.nvd
 .endif
 
+.if !defined(NOPORTDOCS)
+post-extract:
+	${MKDIR} ${WRKDIR}/html
+	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+.endif
+
 post-patch:
 	${PERL} -pi.orig -e \
 		's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \
 		${WRKSRC}/configure ${WRKSRC}/configure.in \
 		${WRKSRC}/configure.pfaedit ${WRKSRC}/configure.pfaedit.in \
-		${WRKSRC}/configure.static ${WRKSRC}/configure.static.in \
+		${WRKSRC}/configure.static.in \
 		${WRKSRC}/configure.ttfmod ${WRKSRC}/configure.ttfmod.in
 	${PERL} -pi.orig -e 's,/usr/share/,${PREFIX}/share/,g' \
 		${WRKSRC}/pfaedit/pfaedit.1
 	${PERL} -pi.orig -e 's,/usr/pkg/,${PREFIX}/,g' \
 		${WRKSRC}/*/[mM]akefile.*
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pfaedit/pfaedit ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/pfaedit
-	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${PREFIX}/share/pfaedit
-	${MKDIR} ${PREFIX}/share/doc/pfaedit
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/pfaedit
-	${INSTALL_MAN} ${WRKSRC}/pfaedit/pfaedit.1 ${PREFIX}/man/man1
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${DATADIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
-	(cd ${WRKDIR}; ${INSTALL_DATA} ${DOCFILES} ${PREFIX}/share/doc/pfaedit)
+	(cd ${WRKDIR}/html; ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 222b472458d4..59157bca970d 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-020306.tgz) = 6a46ef5c46ca04aa5b7174f2ab0c9983
+MD5 (pfaedit_full-020310.tgz) = 9a9c71d32c32a759610a875443b8ec7c
 MD5 (cidmaps.tgz) = 888b70dd745242ba1f0f39015c3e8c88
 MD5 (pfaedit_htdocs-020214.tgz) = 4d05e14c3ad4a25edb3a5da93dcbbf83
diff --git a/print/fontforge/pkg-descr b/print/fontforge/pkg-descr
index a6848695c717..049cf6e9a791 100644
--- a/print/fontforge/pkg-descr
+++ b/print/fontforge/pkg-descr
@@ -3,8 +3,8 @@ fonts in Type 1, CID-Keyed Fonts, TrueType, or OpenType format. It can
 generate bitmaps and save in BDF format or embedded bitmaps in TrueType/
 OpenType fonts. 
 
-If you have installed AutoTrace Version 0.28 (older versions are
-incompatible to this version of PfaEdit), you can generate outlines
+If you have installed AutoTrace Version 0.28 or newer (older versions
+are incompatible to this version of PfaEdit), you can generate outlines
 from imported bitmap images. 
 
 For more information, see 
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 10474a3e3c79..ceaf1fc4caed 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1,4 +1,5 @@
 bin/pfaedit
+bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/AA-Comparison.html
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV-bm.png
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png
@@ -158,5 +159,9 @@ share/pfaedit/Adobe-Identity-0.cidmap
 share/pfaedit/Adobe-Japan1-4.cidmap
 share/pfaedit/Adobe-Japan2-0.cidmap
 share/pfaedit/Adobe-Korea1-2.cidmap
+share/pfaedit/pfaedit.de.ui
+share/pfaedit/pfaedit.en.ui
+share/pfaedit/pfaedit.fr.ui
+share/pfaedit/pfaedit.ru.ui
 @dirrm share/pfaedit
 %%PORTDOCS%%@dirrm share/doc/pfaedit
diff --git a/print/pfaedit/Makefile b/print/pfaedit/Makefile
index 75b55daa122d..23999615b240 100644
--- a/print/pfaedit/Makefile
+++ b/print/pfaedit/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	pfaedit
 PORTVERSION=	20${DIST_VER}
 CATEGORIES=	print
 MASTER_SITES=	http://pfaedit.sourceforge.net/
-DISTFILES=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
+DISTFILES=	${EXTRACT_ONLY}
 .if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}_htdocs-${DOC_VER}.tgz
+DISTFILES+=	${DOCFILE}
 .endif
 
 MAINTAINER=	kanou@mil.allnet.ne.jp
@@ -30,12 +30,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	pfaedit
 
-MAN1=		pfaedit.1
+MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	020306
+DIST_VER=	020310
+EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
 DOC_VER=	020214
+DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
 DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
 		Problems-MacOSX.html accented.html bezier.html bitmapview.html \
 		charview.html cidmenu.html cliargs.html corpchar.html \
@@ -77,27 +79,30 @@ DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
 		document.nvd
 .endif
 
+.if !defined(NOPORTDOCS)
+post-extract:
+	${MKDIR} ${WRKDIR}/html
+	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+.endif
+
 post-patch:
 	${PERL} -pi.orig -e \
 		's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \
 		${WRKSRC}/configure ${WRKSRC}/configure.in \
 		${WRKSRC}/configure.pfaedit ${WRKSRC}/configure.pfaedit.in \
-		${WRKSRC}/configure.static ${WRKSRC}/configure.static.in \
+		${WRKSRC}/configure.static.in \
 		${WRKSRC}/configure.ttfmod ${WRKSRC}/configure.ttfmod.in
 	${PERL} -pi.orig -e 's,/usr/share/,${PREFIX}/share/,g' \
 		${WRKSRC}/pfaedit/pfaedit.1
 	${PERL} -pi.orig -e 's,/usr/pkg/,${PREFIX}/,g' \
 		${WRKSRC}/*/[mM]akefile.*
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pfaedit/pfaedit ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/pfaedit
-	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${PREFIX}/share/pfaedit
-	${MKDIR} ${PREFIX}/share/doc/pfaedit
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/pfaedit
-	${INSTALL_MAN} ${WRKSRC}/pfaedit/pfaedit.1 ${PREFIX}/man/man1
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${DATADIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
-	(cd ${WRKDIR}; ${INSTALL_DATA} ${DOCFILES} ${PREFIX}/share/doc/pfaedit)
+	(cd ${WRKDIR}/html; ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/pfaedit/distinfo b/print/pfaedit/distinfo
index 222b472458d4..59157bca970d 100644
--- a/print/pfaedit/distinfo
+++ b/print/pfaedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-020306.tgz) = 6a46ef5c46ca04aa5b7174f2ab0c9983
+MD5 (pfaedit_full-020310.tgz) = 9a9c71d32c32a759610a875443b8ec7c
 MD5 (cidmaps.tgz) = 888b70dd745242ba1f0f39015c3e8c88
 MD5 (pfaedit_htdocs-020214.tgz) = 4d05e14c3ad4a25edb3a5da93dcbbf83
diff --git a/print/pfaedit/pkg-descr b/print/pfaedit/pkg-descr
index a6848695c717..049cf6e9a791 100644
--- a/print/pfaedit/pkg-descr
+++ b/print/pfaedit/pkg-descr
@@ -3,8 +3,8 @@ fonts in Type 1, CID-Keyed Fonts, TrueType, or OpenType format. It can
 generate bitmaps and save in BDF format or embedded bitmaps in TrueType/
 OpenType fonts. 
 
-If you have installed AutoTrace Version 0.28 (older versions are
-incompatible to this version of PfaEdit), you can generate outlines
+If you have installed AutoTrace Version 0.28 or newer (older versions
+are incompatible to this version of PfaEdit), you can generate outlines
 from imported bitmap images. 
 
 For more information, see 
diff --git a/print/pfaedit/pkg-plist b/print/pfaedit/pkg-plist
index 10474a3e3c79..ceaf1fc4caed 100644
--- a/print/pfaedit/pkg-plist
+++ b/print/pfaedit/pkg-plist
@@ -1,4 +1,5 @@
 bin/pfaedit
+bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/AA-Comparison.html
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV-bm.png
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png
@@ -158,5 +159,9 @@ share/pfaedit/Adobe-Identity-0.cidmap
 share/pfaedit/Adobe-Japan1-4.cidmap
 share/pfaedit/Adobe-Japan2-0.cidmap
 share/pfaedit/Adobe-Korea1-2.cidmap
+share/pfaedit/pfaedit.de.ui
+share/pfaedit/pfaedit.en.ui
+share/pfaedit/pfaedit.fr.ui
+share/pfaedit/pfaedit.ru.ui
 @dirrm share/pfaedit
 %%PORTDOCS%%@dirrm share/doc/pfaedit