sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 20060413

Browse source 
- USE_GCC=3.2+ to fix compiling on 4.x

PR:		ports/96968
Submitted by:	maintainer
Approved by:	lawrance (mentor, implicit)
This commit is contained in:
Ion-Mihai Tetcu 2006-06-10 16:44:10 +00:00
parent 849e57df09
commit b444684131
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=165037
5 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
print/fontforge/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= fontforge PORTNAME= fontforge
PORTVERSION= 20060406 PORTVERSION= 20060413
CATEGORIES= print CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fontforge MASTER_SITE_SUBDIR= fontforge
@ -28,7 +28,7 @@ LIB_DEPENDS= uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
freetype.9:${PORTSDIR}/print/freetype2 \ freetype.9:${PORTSDIR}/print/freetype2 \
xml2.5:${PORTSDIR}/textproc/libxml2 xml2.5:${PORTSDIR}/textproc/libxml2
DOC_VERSION= ${PORTVERSION} DOC_VERSION= 20060406
DOCFILES= ${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2 DOCFILES= ${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
DOCFILES+= ${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2 DOCFILES+= ${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
@ -59,6 +59,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_GCC= 3.2+
MAN1= fontforge.1 sfddiff.1 MAN1= fontforge.1 sfddiff.1

6
print/fontforge/distinfo
View file

@ -1,6 +1,6 @@
MD5 (fontforge_full-20060406.tar.bz2) = 33aabad96a007b90679c392807e6eb7d MD5 (fontforge_full-20060413.tar.bz2) = 5058e33dbbd5c0ca344dc73c6ff7a428
SHA256 (fontforge_full-20060406.tar.bz2) = 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0 SHA256 (fontforge_full-20060413.tar.bz2) = ce1c8a7299d001967b26f9fae002024a190ea5b5092d431dc924888db9adc721
SIZE (fontforge_full-20060406.tar.bz2) = 3168350 SIZE (fontforge_full-20060413.tar.bz2) = 3226436
MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423 MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53 SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
SIZE (freetype-2.1.10.tar.bz2) = 1037107 SIZE (freetype-2.1.10.tar.bz2) = 1037107

28
print/fontforge/files/patch-Makefile.dynamic.in
View file

@ -1,5 +1,5 @@
--- Makefile.dynamic.in.orig Fri Apr 7 22:22:55 2006 --- Makefile.dynamic.in.orig Sun Apr 9 04:24:14 2006
+++ Makefile.dynamic.in Sun Apr 9 02:07:36 2006 +++ Makefile.dynamic.in Thu Apr 27 16:43:18 2006
@@ -54,8 +54,8 @@ @@ -54,8 +54,8 @@
$(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
#cp .libs/*.so.*.* $(libdir) #cp .libs/*.so.*.* $(libdir)
@ -11,21 +11,19 @@
install_docs: install_docs:
mkdir -p $(docdir) mkdir -p $(docdir)
@@ -75,7 +75,7 @@ @@ -76,6 +76,7 @@
mkdir -p $(mandir)/man1
mkdir -p $(sharedir) mkdir -p $(sharedir)
$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir) $(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 # -rm -f $(bindir)/pfaedit
# (cd $(bindir) ; ln -s fontforge pfaedit) # (cd $(bindir) ; ln -s fontforge pfaedit)
# $(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir) # $(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
@@ -84,7 +84,7 @@ @@ -92,6 +93,7 @@
# if you are editing CID keyed files (and even then you can live without them uninstall:
-$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1 -rm $(bindir)/fontforge
$(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1 -rm $(bindir)/sfddiff
-# -$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1 + -rm $(bindir)/acorn2sfd
+ $(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1 -rm $(sharedir)/pfaedit-*.ui
#explicit use of sh to make sure we don't invoke csh with different "if" syntax -rm $(localedir)/*/LC_MESSAGES/FontForge.mo
sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi" -rm $(mandir)/man1/fontforge.1
sh < systemspecific

15
print/fontforge/files/patch-fontforge::Makefile.dynamic.in
View file

@ -1,8 +1,11 @@
--- fontforge/Makefile.dynamic.in.orig Tue Mar 14 09:30:39 2006 --- fontforge/Makefile.dynamic.in.orig Fri Apr 14 02:59:01 2006
+++ fontforge/Makefile.dynamic.in Tue Mar 14 15:59:46 2006 +++ fontforge/Makefile.dynamic.in Thu Apr 27 16:21:35 2006
@@ -45,17 +45,17 @@ @@ -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 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$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
+_CFLAGS = -I$(LOCALBASE)/include -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 + $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
+DLIBS = -rpath $(libdir) ../libgunicode.la @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) fontforge: main.o $(fontforge_LIBOBJECTS)
$(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS) $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)

1
print/fontforge/pkg-plist
View file

@ -1,5 +1,6 @@
bin/fontforge bin/fontforge
bin/sfddiff bin/sfddiff
bin/acorn2sfd
lib/libgdraw.la lib/libgdraw.la
lib/libgdraw.so lib/libgdraw.so
lib/libgdraw.so.1 lib/libgdraw.so.1