Update to 20031210.

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

12 files changed, 142 insertions, 46 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 97b7bb918722..0b1dad975916 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -10,11 +10,7 @@ PORTVERSION=	20${DIST_VER}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR =	pfaedit
-DISTFILES=	${EXTRACT_ONLY}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${DOCFILE}
-.endif
-EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
+DISTFILES=	${EXTRACT_ONLY} ${DOCFILES}
 
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -26,34 +22,30 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf253
+
+EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz
+DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
+DIST_VER=	031210
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-#CONFIGURE_SCRIPT=	configure.static
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
+	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DIST_VER}
-INSTALLS_SHLIB=	yes
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	031029
-
-.if !defined (NOPORTDOCS)
-DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
-.endif
-
-.if !defined (NOPORTDOCS)
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+	${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz
 	${RM} ${WRKDIR}/html/cidmaps.tgz
-	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
-.else
-	${MKDIR} ${WRKSRC}/cidmap
-	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
-.endif
+
+# configure is not executed automatically by defining 'USE_AUTOCONF_VER=253'.
+pre-configure:
+	(cd ${WRKSRC} ; autoconf)
 
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 4ddb6e85735d..8b0432baee80 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1 @@
-MD5 (pfaedit_full-031029.tgz) = cfe3d9e7fd88a7fa89f3e2ec82de5b4b
-MD5 (cidmaps.tgz) = 542c4ddaaa6689de217d3a96678b4e69
-MD5 (pfaedit_htdocs-031029.tgz) = e61d565c758d703f5c02e3be4eb659fe
+MD5 (pfaedit_full-031210.tgz) = e193fab1297831a6cd67e6f25eff63ca
diff --git a/print/fontforge/files/patch-configure.dynamic.in b/print/fontforge/files/patch-configure.dynamic.in
new file mode 100644
index 000000000000..33e4e850b965
--- /dev/null
+++ b/print/fontforge/files/patch-configure.dynamic.in
@@ -0,0 +1,19 @@
+--- configure.dynamic.in.orig	Sat Dec  6 02:20:19 2003
++++ configure.dynamic.in	Wed Jan 21 09:51:24 2004
+@@ -47,7 +47,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -89,8 +88,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.in b/print/fontforge/files/patch-configure.in
new file mode 100644
index 000000000000..55c6597733d2
--- /dev/null
+++ b/print/fontforge/files/patch-configure.in
@@ -0,0 +1,19 @@
+--- configure.in.orig	Thu Dec  4 02:51:54 2003
++++ configure.in	Tue Jan 20 21:45:56 2004
+@@ -47,7 +47,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -89,8 +88,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.static.in b/print/fontforge/files/patch-configure.static.in
new file mode 100644
index 000000000000..ffd525fcb656
--- /dev/null
+++ b/print/fontforge/files/patch-configure.static.in
@@ -0,0 +1,19 @@
+--- configure.static.in.orig	Thu Dec  4 02:51:54 2003
++++ configure.static.in	Wed Jan 21 09:50:26 2004
+@@ -33,7 +33,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -75,8 +74,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_CHECK_LIB(freetype, FT_New_Memory_Face, [
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 7410f7208647..f0d402f59f1f 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -130,6 +130,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%share/doc/pfaedit/bitmapchar.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapsavail.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapview.html
+%%PORTDOCS%%share/doc/pfaedit/boustrophedon.png
 %%PORTDOCS%%share/doc/pfaedit/bvlayers.png
 %%PORTDOCS%%share/doc/pfaedit/bvtools.png
 %%PORTDOCS%%share/doc/pfaedit/cap-height.png
diff --git a/print/pfaedit/Makefile b/print/pfaedit/Makefile
index 97b7bb918722..0b1dad975916 100644
--- a/print/pfaedit/Makefile
+++ b/print/pfaedit/Makefile
@@ -10,11 +10,7 @@ PORTVERSION=	20${DIST_VER}
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR =	pfaedit
-DISTFILES=	${EXTRACT_ONLY}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${DOCFILE}
-.endif
-EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
+DISTFILES=	${EXTRACT_ONLY} ${DOCFILES}
 
 MAINTAINER=	kanou@khdd.net
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -26,34 +22,30 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf253
+
+EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz
+DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
+DIST_VER=	031210
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-#CONFIGURE_SCRIPT=	configure.static
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2"
+	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DIST_VER}
-INSTALLS_SHLIB=	yes
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	031029
-
-.if !defined (NOPORTDOCS)
-DOCFILE=	${PORTNAME}_htdocs-${DIST_VER}.tgz
-.endif
-
-.if !defined (NOPORTDOCS)
 post-extract:
 	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+	${TAR} -xzC ${WRKSRC}/cidmap -f ${WRKDIR}/html/cidmaps.tgz
 	${RM} ${WRKDIR}/html/cidmaps.tgz
-	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
-.else
-	${MKDIR} ${WRKSRC}/cidmap
-	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
-.endif
+
+# configure is not executed automatically by defining 'USE_AUTOCONF_VER=253'.
+pre-configure:
+	(cd ${WRKSRC} ; autoconf)
 
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/print/pfaedit/distinfo b/print/pfaedit/distinfo
index 4ddb6e85735d..8b0432baee80 100644
--- a/print/pfaedit/distinfo
+++ b/print/pfaedit/distinfo
@@ -1,3 +1 @@
-MD5 (pfaedit_full-031029.tgz) = cfe3d9e7fd88a7fa89f3e2ec82de5b4b
-MD5 (cidmaps.tgz) = 542c4ddaaa6689de217d3a96678b4e69
-MD5 (pfaedit_htdocs-031029.tgz) = e61d565c758d703f5c02e3be4eb659fe
+MD5 (pfaedit_full-031210.tgz) = e193fab1297831a6cd67e6f25eff63ca
diff --git a/print/pfaedit/files/patch-configure.dynamic.in b/print/pfaedit/files/patch-configure.dynamic.in
new file mode 100644
index 000000000000..33e4e850b965
--- /dev/null
+++ b/print/pfaedit/files/patch-configure.dynamic.in
@@ -0,0 +1,19 @@
+--- configure.dynamic.in.orig	Sat Dec  6 02:20:19 2003
++++ configure.dynamic.in	Wed Jan 21 09:51:24 2004
+@@ -47,7 +47,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -89,8 +88,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_ARG_WITH(freetype-bytecode,
diff --git a/print/pfaedit/files/patch-configure.in b/print/pfaedit/files/patch-configure.in
new file mode 100644
index 000000000000..55c6597733d2
--- /dev/null
+++ b/print/pfaedit/files/patch-configure.in
@@ -0,0 +1,19 @@
+--- configure.in.orig	Thu Dec  4 02:51:54 2003
++++ configure.in	Tue Jan 20 21:45:56 2004
+@@ -47,7 +47,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -89,8 +88,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_ARG_WITH(freetype-bytecode,
diff --git a/print/pfaedit/files/patch-configure.static.in b/print/pfaedit/files/patch-configure.static.in
new file mode 100644
index 000000000000..ffd525fcb656
--- /dev/null
+++ b/print/pfaedit/files/patch-configure.static.in
@@ -0,0 +1,19 @@
+--- configure.static.in.orig	Thu Dec  4 02:51:54 2003
++++ configure.static.in	Wed Jan 21 09:50:26 2004
+@@ -33,7 +33,6 @@
+ 
+ AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc
+ AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
+-AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
+ 
+ dnl Is there a better way to add a directory to the include path?
+ 
+@@ -75,8 +74,6 @@
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
+ AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
+ AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
+-
+-AC_CHECK_HEADERS([iconv.h])
+ 
+ gww_hasbytecode="no"
+ AC_CHECK_LIB(freetype, FT_New_Memory_Face, [
diff --git a/print/pfaedit/pkg-plist b/print/pfaedit/pkg-plist
index 7410f7208647..f0d402f59f1f 100644
--- a/print/pfaedit/pkg-plist
+++ b/print/pfaedit/pkg-plist
@@ -130,6 +130,7 @@ lib/libgunicode.so.2
 %%PORTDOCS%%share/doc/pfaedit/bitmapchar.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapsavail.png
 %%PORTDOCS%%share/doc/pfaedit/bitmapview.html
+%%PORTDOCS%%share/doc/pfaedit/boustrophedon.png
 %%PORTDOCS%%share/doc/pfaedit/bvlayers.png
 %%PORTDOCS%%share/doc/pfaedit/bvtools.png
 %%PORTDOCS%%share/doc/pfaedit/cap-height.png