Date: 8 May 2006 03:59:07 -0000 From: KANOU Hiroki <kanou@khdd.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kanou@khdd.net Subject: ports/96968: maintainer-update: print/fontforge to 20060413 Message-ID: <20060508035907.21387.qmail@khdd.net> Resent-Message-ID: <200605080400.k4840bd2017423@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96968
>Category: ports
>Synopsis: maintainer-update: print/fontforge to 20060413
>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: Mon May 08 04:00:36 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KANOU Hiroki
>Release: FreeBSD 5.5-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD tin.khdd.net 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #1: Mon Mar 27 18:19:13 JST 2006 kanou@tin.khdd.net:/usr/src/sys/i386/compile/GENERIC i386
>Description:
fontforge port is updated from 20060406 to 20060413 by maintainer.
>How-To-Repeat:
>Fix:
diff -uNr fontforge.orig/Makefile fontforge/Makefile
--- fontforge.orig/Makefile Mon Apr 10 03:19:15 2006
+++ fontforge/Makefile Thu Apr 27 16:13:45 2006
@@ -6,7 +6,7 @@
#
PORTNAME= fontforge
-PORTVERSION= 20060406
+PORTVERSION= 20060413
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fontforge
@@ -28,7 +28,7 @@
freetype.9:${PORTSDIR}/print/freetype2 \
xml2.5:${PORTSDIR}/textproc/libxml2
-DOC_VERSION= ${PORTVERSION}
+DOC_VERSION= 20060406
DOCFILES= ${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
.if !defined(NOPORTDOCS)
DOCFILES+= ${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
diff -uNr fontforge.orig/distinfo fontforge/distinfo
--- fontforge.orig/distinfo Sun Apr 9 09:13:47 2006
+++ fontforge/distinfo Thu Apr 27 16:13:48 2006
@@ -1,6 +1,6 @@
-MD5 (fontforge_full-20060406.tar.bz2) = 33aabad96a007b90679c392807e6eb7d
-SHA256 (fontforge_full-20060406.tar.bz2) = 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0
-SIZE (fontforge_full-20060406.tar.bz2) = 3168350
+MD5 (fontforge_full-20060413.tar.bz2) = 5058e33dbbd5c0ca344dc73c6ff7a428
+SHA256 (fontforge_full-20060413.tar.bz2) = ce1c8a7299d001967b26f9fae002024a190ea5b5092d431dc924888db9adc721
+SIZE (fontforge_full-20060413.tar.bz2) = 3226436
MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
SIZE (freetype-2.1.10.tar.bz2) = 1037107
diff -uNr fontforge.orig/files/patch-Makefile.dynamic.in fontforge/files/patch-Makefile.dynamic.in
--- fontforge.orig/files/patch-Makefile.dynamic.in Sun Apr 9 09:13:48 2006
+++ fontforge/files/patch-Makefile.dynamic.in Thu Apr 27 16:43:41 2006
@@ -1,5 +1,5 @@
---- Makefile.dynamic.in.orig Fri Apr 7 22:22:55 2006
-+++ Makefile.dynamic.in Sun Apr 9 02:07:36 2006
+--- Makefile.dynamic.in.orig Sun Apr 9 04:24:14 2006
++++ Makefile.dynamic.in Thu Apr 27 16:43:18 2006
@@ -54,8 +54,8 @@
$(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
#cp .libs/*.so.*.* $(libdir)
@@ -11,21 +11,19 @@
install_docs:
mkdir -p $(docdir)
-@@ -75,7 +75,7 @@
- mkdir -p $(mandir)/man1
+@@ -76,6 +76,7 @@
mkdir -p $(sharedir)
$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
--# -$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
-+ $(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL) -c fontforge/acorn2sfd $(bindir)
# -rm -f $(bindir)/pfaedit
# (cd $(bindir) ; ln -s fontforge pfaedit)
# $(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
-@@ -84,7 +84,7 @@
- # if you are editing CID keyed files (and even then you can live without them
- -$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
- $(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
--# -$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
-+ $(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
- sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
- sh < systemspecific
+@@ -92,6 +93,7 @@
+ uninstall:
+ -rm $(bindir)/fontforge
+ -rm $(bindir)/sfddiff
++ -rm $(bindir)/acorn2sfd
+ -rm $(sharedir)/pfaedit-*.ui
+ -rm $(localedir)/*/LC_MESSAGES/FontForge.mo
+ -rm $(mandir)/man1/fontforge.1
diff -uNr fontforge.orig/files/patch-fontforge::Makefile.dynamic.in fontforge/files/patch-fontforge::Makefile.dynamic.in
--- fontforge.orig/files/patch-fontforge::Makefile.dynamic.in Sun Apr 9 09:13:48 2006
+++ fontforge/files/patch-fontforge::Makefile.dynamic.in Thu Apr 27 16:22:05 2006
@@ -1,8 +1,11 @@
---- fontforge/Makefile.dynamic.in.orig Tue Mar 14 09:30:39 2006
-+++ fontforge/Makefile.dynamic.in Tue Mar 14 15:59:46 2006
-@@ -45,17 +45,17 @@
+--- fontforge/Makefile.dynamic.in.orig Fri Apr 14 02:59:01 2006
++++ fontforge/Makefile.dynamic.in Thu Apr 27 16:21:35 2006
+@@ -43,19 +43,19 @@
+ cvdgloss.o groups.o parsepdf.o plugins.o bdfinfo.o \
+ glyphcomp.o @FF_EXTRA_FILES@
DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
- ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
+-ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
++ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o stamp.o namelist.o pua.o
-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
+_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
@@ -17,8 +20,8 @@
+ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
+DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
--all: fontforge
-+all: fontforge sfddiff
+-all: fontforge sfddiff
++all: fontforge sfddiff acorn2sfd
fontforge: main.o $(fontforge_LIBOBJECTS)
$(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)
diff -uNr fontforge.orig/pkg-plist fontforge/pkg-plist
--- fontforge.orig/pkg-plist Sun Apr 9 09:13:47 2006
+++ fontforge/pkg-plist Thu Apr 27 16:22:50 2006
@@ -1,5 +1,6 @@
bin/fontforge
bin/sfddiff
+bin/acorn2sfd
lib/libgdraw.la
lib/libgdraw.so
lib/libgdraw.so.1
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060508035907.21387.qmail>