Update to 030429.

PR:		ports/51629
Submitted by:	KANOU Hiroki <kanou@khdd.net> (maintainer)

7 files changed, 62 insertions, 6 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 69b9e0978d4b..7f66f31a1d93 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -30,16 +30,15 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	configure.static
+#CONFIGURE_SCRIPT=	configure.static
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
 WRKSRC=		${WRKDIR}/${PORTNAME}
-ALL_TARGET=	pfaedit
 INSTALLS_SHLIB=	yes
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	030404
+DIST_VER=	030429
 LIBUNINAMESLIST_VER=	030116
 
 .if !defined(NOPORTDOCS)
@@ -53,6 +52,9 @@ post-extract:
 	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
 	${RM} ${WRKDIR}/html/cidmaps.tgz
 	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
+.else
+	${MKDIR} ${WRKSRC}/cidmap
+	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
 .endif
 
 post-configure:
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 08e1480eb4f7..2844032939b3 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-MD5 (pfaedit_full-030404.tgz) = 50a5d506e19cff17f070ebfb5c22ed09
+MD5 (pfaedit_full-030429.tgz) = 4c3fbf9bfb56c49110dadc9d5f38d65a
 MD5 (cidmaps.tgz) = 542c4ddaaa6689de217d3a96678b4e69
 MD5 (libuninameslist_src-030116.tgz) = 740d2dacafd70f5dfa17a5d2b04aa97b
-MD5 (pfaedit_htdocs-030404.tgz) = 0f8bb7f83bce24e3932ae9f8ae99882c
+MD5 (pfaedit_htdocs-030429.tgz) = a44e6a0b08b6ffb034a2b9a827577a3a
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
new file mode 100644
index 000000000000..1a9bd801c48b
--- /dev/null
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -0,0 +1,25 @@
+--- Makefile.dynamic.in.orig	Tue Dec  3 10:07:14 2002
++++ Makefile.dynamic.in	Sun Apr 20 16:11:41 2003
+@@ -53,15 +53,16 @@
+ 	mkdir -p $(bindir)
+ 	mkdir -p $(mandir)/man1
+ 	mkdir -p $(sharedir)
+-	$(LIBTOOL) $(INSTALL) -c pfaedit/pfaedit $(bindir)
+-	$(LIBTOOL) $(INSTALL) -c pfaedit/sfddiff $(bindir)
+-	cp pfaedit/pfaedit-*.ui $(sharedir)
++	${BSD_INSTALL_PROGRAM} pfaedit/.libs/pfaedit $(bindir)
++	${BSD_INSTALL_PROGRAM} pfaedit/.libs/sfddiff $(bindir)
++	${BSD_INSTALL_PROGRAM} pfaedit/.libs/acorn2sfd $(bindir)
++	${BSD_INSTALL_DATA} pfaedit/pfaedit-*.ui $(sharedir)
+ #The next line will fail for most installs. If you have downloaded the cidmaps
+ # this will install them. If you haven't it won't. You only need the cidmaps
+ # if you are editing CID keyed files (and even then you can live without them
+-	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
+-	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
+-	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
++	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
+ 
+ uninstall:
+ 	-rm $(bindir)/pfaedit
diff --git a/print/fontforge/files/patch-Makefile.static.in b/print/fontforge/files/patch-Makefile.static.in
index 1bdf40d4cc50..a740eef7b0bf 100644
--- a/print/fontforge/files/patch-Makefile.static.in
+++ b/print/fontforge/files/patch-Makefile.static.in
@@ -17,7 +17,7 @@
 -	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
 -	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
 -	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
-+	${BSD_INSTALL_MAN}  $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
++	${BSD_INSTALL_DATA}  $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
 +	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
 +	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
  
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
new file mode 100644
index 000000000000..ab9e6dc4963b
--- /dev/null
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -0,0 +1,11 @@
+--- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
++++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
+@@ -47,7 +47,7 @@
+     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
+ DLIBS = -rpath $(libdir) ../libgunicode.la -lm
+ 
+-all: pfaedit-en.ui pfaedit sfddiff
++all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
+ 
+ pfaedit: nomen.h $(pfaedit_OBJECTS)
+ 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
diff --git a/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in b/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
new file mode 100644
index 000000000000..ab9e6dc4963b
--- /dev/null
+++ b/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
@@ -0,0 +1,11 @@
+--- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
++++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
+@@ -47,7 +47,7 @@
+     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
+ DLIBS = -rpath $(libdir) ../libgunicode.la -lm
+ 
+-all: pfaedit-en.ui pfaedit sfddiff
++all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
+ 
+ pfaedit: nomen.h $(pfaedit_OBJECTS)
+ 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 3932f8c17190..5848a70d402a 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -86,6 +86,8 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/TTStack.png
 %%PORTDOCS%%share/doc/pfaedit/TTStorage.png
 %%PORTDOCS%%share/doc/pfaedit/TilePath.png
+%%PORTDOCS%%share/doc/pfaedit/To-kerned.png
+%%PORTDOCS%%share/doc/pfaedit/To-unkerned.png
 %%PORTDOCS%%share/doc/pfaedit/TrueOpenTables.html
 %%PORTDOCS%%share/doc/pfaedit/a_dieresis_macron.png
 %%PORTDOCS%%share/doc/pfaedit/a_with_anchor.png
@@ -103,6 +105,7 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/autowidthmenu.png
 %%PORTDOCS%%share/doc/pfaedit/bezier.gif
 %%PORTDOCS%%share/doc/pfaedit/bezier.html
+%%PORTDOCS%%share/doc/pfaedit/bibliography.html
 %%PORTDOCS%%share/doc/pfaedit/bitmapchar.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapsavail.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapview.html
@@ -219,6 +222,7 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/langdlg.png
 %%PORTDOCS%%share/doc/pfaedit/layers.png
 %%PORTDOCS%%share/doc/pfaedit/lcani.gif
+%%PORTDOCS%%share/doc/pfaedit/lcdigits.png
 %%PORTDOCS%%share/doc/pfaedit/license.html
 %%PORTDOCS%%share/doc/pfaedit/locale.html
 %%PORTDOCS%%share/doc/pfaedit/logo3.gif
@@ -281,6 +285,9 @@ lib/libuninameslist.so.0
 %%PORTDOCS%%share/doc/pfaedit/sfd.html
 %%PORTDOCS%%share/doc/pfaedit/sfddiff.html
 %%PORTDOCS%%share/doc/pfaedit/sfdformat.html
+%%PORTDOCS%%share/doc/pfaedit/sidebearings.png
+%%PORTDOCS%%share/doc/pfaedit/showatt.html
+%%PORTDOCS%%share/doc/pfaedit/showatt.png
 %%PORTDOCS%%share/doc/pfaedit/splash.png
 %%PORTDOCS%%share/doc/pfaedit/splinefont.html
 %%PORTDOCS%%share/doc/pfaedit/splines.gif