- Update to the lastest version

- Update MASTER_SITES

PR: 29986
Submitted by: MAINTAINER

5 files changed, 51 insertions, 11 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index a109174521d1..ca5b0872d938 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	pfaedit
-PORTVERSION=	20010410
+PORTVERSION=	20010808
 CATEGORIES=	print
-MASTER_SITES=   http://bibliofile.mc.duke.edu/gww/Freeware/PfaEdit/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=   http://pfaedit.sourceforge.net/
 DISTFILES=	${PORTNAME}_src-${DIST_VER}.tgz \
-		libgunicode-${LIBGUNI_VER}.tgz libgdraw-${LIBGDRAW_VER}.tgz
+		libgunicode-${LIBGUNI_VER}.tgz libgdraw-${LIBGDRAW_VER}.tgz \
+		cidmaps.tgz
 
 MAINTAINER=	kanou@mil.allnet.ne.jp
 
-DIST_VER=	230401
-LIBGDRAW_VER=	220401
-LIBGUNI_VER=	220401
+DIST_VER=	010808
+LIBGDRAW_VER=	010808
+LIBGUNI_VER=	010808
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -36,6 +35,8 @@ MAN1=		pfaedit.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pfaedit/pfaedit ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/pfaedit
+	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${PREFIX}/share/pfaedit
 	${INSTALL_MAN} ${WRKSRC}/pfaedit/pfaedit.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 45a5569f6444..8e644bd81795 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,4 @@
-MD5 (pfaedit_src-230401.tgz) = 274232db99779d96dbcd673172b3bc46
-MD5 (libgunicode-220401.tgz) = e4da6d0c4380df8d2cfdec87689525e1
-MD5 (libgdraw-220401.tgz) = 81464356be0dd91866601219e5492e34
+MD5 (pfaedit_src-010808.tgz) = 5d6d99029a038e4930279cc882abfc2b
+MD5 (cidmaps.tgz) = b2f5fd18ea3c8205e6923832505bf73b
+MD5 (libgunicode-010808.tgz) = 4d45e6d0e772b12f5664a4064f9fbdf5
+MD5 (libgdraw-010808.tgz) = 6b5db477d345fdf72165d6248ab4534c
diff --git a/print/fontforge/files/patch-aa b/print/fontforge/files/patch-aa
new file mode 100644
index 000000000000..6e25fa327010
--- /dev/null
+++ b/print/fontforge/files/patch-aa
@@ -0,0 +1,20 @@
+--- pfaedit/encoding.c.orig	Sat Aug  4 06:27:24 2001
++++ pfaedit/encoding.c	Thu Aug 23 19:21:17 2001
+@@ -683,7 +683,7 @@
+     if ( file==NULL )
+ 	file = SearchDirForCidMap(GResourceProgramDir,registry,ordering,supplement,&maybefile);
+     if ( file==NULL )
+-	file = SearchDirForCidMap("/usr/share/pfaedit",registry,ordering,supplement,&maybefile);
++	file = SearchDirForCidMap("/usr/local/share/pfaedit",registry,ordering,supplement,&maybefile);
+ 
+     if ( file==NULL && (maybe!=NULL || maybefile!=NULL)) {
+ 	if ( maybefile!=NULL ) {
+@@ -864,7 +864,7 @@
+     }
+     FindMapsInDir(&block,".");
+     FindMapsInDir(&block,GResourceProgramDir);
+-    FindMapsInDir(&block,"/usr/share/pfaedit");
++    FindMapsInDir(&block,"/usr/local/share/pfaedit");
+ 
+     choices = gcalloc(block.cur+2,sizeof(unichar_t *));
+     choices[0] = u_copy(GStringGetResource(_STR_Browse,NULL));
diff --git a/print/fontforge/files/patch-ab b/print/fontforge/files/patch-ab
new file mode 100644
index 000000000000..bbb964fd9827
--- /dev/null
+++ b/print/fontforge/files/patch-ab
@@ -0,0 +1,11 @@
+--- pfaedit/prefs.c.orig	Thu Aug  9 08:55:45 2001
++++ pfaedit/prefs.c	Thu Aug 23 19:22:49 2001
+@@ -134,7 +134,7 @@
+ 	GFileBuildName(GResourceProgramDir,buffer,full,sizeof(full));
+     }
+     if ( !GFileExists(full)) {
+-	GFileBuildName("/usr/share/pfaedit",buffer,full,sizeof(full));
++	GFileBuildName("/usr/local/share/pfaedit",buffer,full,sizeof(full));
+ 	if ( !GFileExists(full) && strlen(loc)>5 ) {
+ 	    strcpy(buffer+13,".ui");
+ 	    GFileBuildName(GResourceProgramDir,buffer,full,sizeof(full));
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 4766bcbf81c1..5a4d447c803c 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1 +1,8 @@
 bin/pfaedit
+share/pfaedit/Adobe-CNS1-3.cidmap
+share/pfaedit/Adobe-Identity-0.cidmap
+share/pfaedit/Adobe-Japan2-0.cidmap
+share/pfaedit/Adobe-GB1-4.cidmap
+share/pfaedit/Adobe-Japan1-4.cidmap
+share/pfaedit/Adobe-Korea1-2.cidmap
+@dirrm share/pfaedit