ports/61725: maintainer-update: print/pfaedit to 20031210

Thu Jan 22 14:30:16 UTC 2004

>Number:         61725
>Category:       ports
>Synopsis:       maintainer-update: print/pfaedit to 20031210
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 22 06:30:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     KANOU Hiroki
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD khdd.net 4.9-STABLE FreeBSD 4.9-STABLE #1: Wed Oct 29 23:21:29 JST 2003 kanou at khdd.net:/usr/obj/usr/src/sys/COPPER i386

>Description:
	PfaEdit port is updated by maintainer.

	new files:	files/patch-configure.dynamic.in
			files/patch-configure.in
			files/patch-configure.static.in

>How-To-Repeat:
>Fix:

diff -uNr pfaedit.orig/Makefile pfaedit/Makefile

--- pfaedit.orig/Makefile	Fri Nov 14 11:57:16 2003
+++ pfaedit/Makefile	Wed Jan 21 10:29:36 2004
@@ -10,11 +10,7 @@
 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 at khdd.net
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -26,34 +22,30 @@
 		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 -uNr pfaedit.orig/distinfo pfaedit/distinfo
--- pfaedit.orig/distinfo	Fri Nov 14 11:57:16 2003
+++ pfaedit/distinfo	Tue Jan 20 22:34:14 2004
@@ -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 -uNr pfaedit.orig/files/patch-configure.dynamic.in pfaedit/files/patch-configure.dynamic.in
--- pfaedit.orig/files/patch-configure.dynamic.in	Thu Jan  1 09:00:00 1970
+++ pfaedit/files/patch-configure.dynamic.in	Wed Jan 21 09:51:50 2004
@@ -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 -uNr pfaedit.orig/files/patch-configure.in pfaedit/files/patch-configure.in
--- pfaedit.orig/files/patch-configure.in	Thu Jan  1 09:00:00 1970
+++ pfaedit/files/patch-configure.in	Tue Jan 20 21:46:32 2004
@@ -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 -uNr pfaedit.orig/files/patch-configure.static.in pfaedit/files/patch-configure.static.in
--- pfaedit.orig/files/patch-configure.static.in	Thu Jan  1 09:00:00 1970
+++ pfaedit/files/patch-configure.static.in	Wed Jan 21 09:51:04 2004
@@ -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 -uNr pfaedit.orig/pkg-plist pfaedit/pkg-plist
--- pfaedit.orig/pkg-plist	Fri Nov 14 11:57:16 2003
+++ pfaedit/pkg-plist	Wed Jan 21 00:13:00 2004
@@ -130,6 +130,7 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted:

