diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-29 19:00:22 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-29 19:00:22 +0000 |
commit | 8943f01e8b58e7bde301590a128c84097cc3ae2e (patch) | |
tree | 1ccf4c06d3af80d4e42a54a13d2346b17aee354f /print | |
parent | Update to version 1.2.29. (diff) |
upgrade to 20020627
PR: 39983
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=62180
Diffstat (limited to 'print')
-rw-r--r-- | print/fontforge/Makefile | 12 | ||||
-rw-r--r-- | print/fontforge/distinfo | 4 | ||||
-rw-r--r-- | print/fontforge/files/patch-Makefile.in | 12 | ||||
-rw-r--r-- | print/fontforge/pkg-plist | 18 | ||||
-rw-r--r-- | print/pfaedit/Makefile | 12 | ||||
-rw-r--r-- | print/pfaedit/distinfo | 4 | ||||
-rw-r--r-- | print/pfaedit/files/patch-Makefile.in | 12 | ||||
-rw-r--r-- | print/pfaedit/pkg-plist | 18 |
8 files changed, 56 insertions, 36 deletions
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index da7e8ec2351a..1106cb23ab26 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -24,6 +24,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_GMAKE= yes USE_XLIB= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" @@ -32,11 +33,11 @@ ALL_TARGET= pfaedit MAN1= pfaedit.1 sfddiff.1 -DIST_VER= 020518 +DIST_VER= 020627 EXTRACT_ONLY= ${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz .if !defined(NOPORTDOCS) -DOC_VER= 020416 +DOC_VER= 020626 DOCFILE= ${PORTNAME}_htdocs-${DOC_VER}.tgz .endif @@ -49,16 +50,15 @@ post-extract: .endif post-patch: - ${PERL} -pi.orig -e \ + ${REINPLACE_CMD} -e \ 's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \ ${WRKSRC}/configure ${WRKSRC}/configure.in \ ${WRKSRC}/configure.pfaedit ${WRKSRC}/configure.pfaedit.in \ ${WRKSRC}/configure.static.in \ ${WRKSRC}/configure.ttfmod ${WRKSRC}/configure.ttfmod.in - ${PERL} -pi.orig -e 's,/usr/share/,${PREFIX}/share/,g' \ + ${REINPLACE_CMD} -e 's,/usr/share/,${PREFIX}/share/,g' \ ${WRKSRC}/pfaedit/pfaedit.1 - ${PERL} -pi.orig -e 's,/usr/pkg/,${PREFIX}/,g' \ - ${WRKSRC}/*/[mM]akefile.* + ${REINPLACE_CMD} -e 's,/usr/pkg/,${PREFIX}/,g' ${WRKSRC}/*/[mM]akefile.* post-install: ${MKDIR} ${DOCSDIR} diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo index f346410bbeb9..b354b8e80c64 100644 --- a/print/fontforge/distinfo +++ b/print/fontforge/distinfo @@ -1,3 +1,3 @@ -MD5 (pfaedit_full-020518.tgz) = aca03856c22eaa7af4245fba7c88f4af +MD5 (pfaedit_full-020627.tgz) = e5e406e8435f564fcc0b12bb674d18dd MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f -MD5 (pfaedit_htdocs-020416.tgz) = df31ad47fbbab26642550bc91ab52478 +MD5 (pfaedit_htdocs-020626.tgz) = cb0fab49be57efbd42c755255f2cce5a diff --git a/print/fontforge/files/patch-Makefile.in b/print/fontforge/files/patch-Makefile.in index 91d5f26e1f21..667df5cdefde 100644 --- a/print/fontforge/files/patch-Makefile.in +++ b/print/fontforge/files/patch-Makefile.in @@ -1,22 +1,22 @@ ---- Makefile.in.orig Sat Mar 16 08:43:35 2002 -+++ Makefile.in Sun May 12 18:02:27 2002 -@@ -37,15 +37,15 @@ +--- Makefile.in.orig Sat Jun 29 10:17:51 2002 ++++ Makefile.in Sat Jun 29 10:19:57 2002 +@@ -39,15 +39,15 @@ mkdir -p $(bindir) mkdir -p $(mandir)/man1 mkdir -p $(sharedir) - cp pfaedit/pfaedit $(bindir) - cp pfaedit/sfddiff $(bindir) -- cp pfaedit/pfaedit.*.ui $(sharedir) +- cp pfaedit/pfaedit-*.ui $(sharedir) + ${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir) + ${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir) -+ ${BSD_INSTALL_DATA} pfaedit/pfaedit.*.ui $(sharedir) ++ ${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) ++ ${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/pkg-plist b/print/fontforge/pkg-plist index 6e30938b78d3..6f5bbf0ce3a7 100644 --- a/print/fontforge/pkg-plist +++ b/print/fontforge/pkg-plist @@ -5,6 +5,7 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png %%PORTDOCS%%share/doc/pfaedit/Anna.gif %%PORTDOCS%%share/doc/pfaedit/Antigone.gif +%%PORTDOCS%%share/doc/pfaedit/BDFgrey.html %%PORTDOCS%%share/doc/pfaedit/BitmapView.png %%PORTDOCS%%share/doc/pfaedit/C1.png %%PORTDOCS%%share/doc/pfaedit/C10.png @@ -51,6 +52,9 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/Print.png %%PORTDOCS%%share/doc/pfaedit/Problems-MacOSX.html %%PORTDOCS%%share/doc/pfaedit/ReviewHints.png +%%PORTDOCS%%share/doc/pfaedit/Shades.png +%%PORTDOCS%%share/doc/pfaedit/Shades2.png +%%PORTDOCS%%share/doc/pfaedit/Shades4.png %%PORTDOCS%%share/doc/pfaedit/Spacem_1.png %%PORTDOCS%%share/doc/pfaedit/Spacem_2.png %%PORTDOCS%%share/doc/pfaedit/aacutebase.png @@ -105,6 +109,8 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/fontview.ru.png %%PORTDOCS%%share/doc/pfaedit/future.html %%PORTDOCS%%share/doc/pfaedit/getinfo.html +%%PORTDOCS%%share/doc/pfaedit/greymapedit.png +%%PORTDOCS%%share/doc/pfaedit/greymapsavail.png %%PORTDOCS%%share/doc/pfaedit/helpmenu.html %%PORTDOCS%%share/doc/pfaedit/hexley.png %%PORTDOCS%%share/doc/pfaedit/hinting.html @@ -115,6 +121,7 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/layers.png %%PORTDOCS%%share/doc/pfaedit/license.html %%PORTDOCS%%share/doc/pfaedit/locale.html +%%PORTDOCS%%share/doc/pfaedit/logo3.gif %%PORTDOCS%%share/doc/pfaedit/macformats.html %%PORTDOCS%%share/doc/pfaedit/metricsmenu.html %%PORTDOCS%%share/doc/pfaedit/metricsview.html @@ -137,7 +144,10 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png %%PORTDOCS%%share/doc/pfaedit/problems.html %%PORTDOCS%%share/doc/pfaedit/quotations.html +%%PORTDOCS%%share/doc/pfaedit/rplref.png +%%PORTDOCS%%share/doc/pfaedit/rplserifs.png %%PORTDOCS%%share/doc/pfaedit/scripting.html +%%PORTDOCS%%share/doc/pfaedit/search.html %%PORTDOCS%%share/doc/pfaedit/serif.png %%PORTDOCS%%share/doc/pfaedit/serif2.png %%PORTDOCS%%share/doc/pfaedit/setwidth.png @@ -163,9 +173,9 @@ share/pfaedit/Adobe-Identity-0.cidmap share/pfaedit/Adobe-Japan1-4.cidmap share/pfaedit/Adobe-Japan2-0.cidmap share/pfaedit/Adobe-Korea1-2.cidmap -share/pfaedit/pfaedit.de.ui -share/pfaedit/pfaedit.en.ui -share/pfaedit/pfaedit.fr.ui -share/pfaedit/pfaedit.ru.ui +share/pfaedit/pfaedit-de.ui +share/pfaedit/pfaedit-en.ui +share/pfaedit/pfaedit-fr.ui +share/pfaedit/pfaedit-ru.ui @dirrm share/pfaedit %%PORTDOCS%%@dirrm share/doc/pfaedit diff --git a/print/pfaedit/Makefile b/print/pfaedit/Makefile index da7e8ec2351a..1106cb23ab26 100644 --- a/print/pfaedit/Makefile +++ b/print/pfaedit/Makefile @@ -24,6 +24,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_GMAKE= yes USE_XLIB= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" @@ -32,11 +33,11 @@ ALL_TARGET= pfaedit MAN1= pfaedit.1 sfddiff.1 -DIST_VER= 020518 +DIST_VER= 020627 EXTRACT_ONLY= ${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz .if !defined(NOPORTDOCS) -DOC_VER= 020416 +DOC_VER= 020626 DOCFILE= ${PORTNAME}_htdocs-${DOC_VER}.tgz .endif @@ -49,16 +50,15 @@ post-extract: .endif post-patch: - ${PERL} -pi.orig -e \ + ${REINPLACE_CMD} -e \ 's,/usr/include/freetype2,${PREFIX}/include/freetype2 -I${PREFIX}/include,g' \ ${WRKSRC}/configure ${WRKSRC}/configure.in \ ${WRKSRC}/configure.pfaedit ${WRKSRC}/configure.pfaedit.in \ ${WRKSRC}/configure.static.in \ ${WRKSRC}/configure.ttfmod ${WRKSRC}/configure.ttfmod.in - ${PERL} -pi.orig -e 's,/usr/share/,${PREFIX}/share/,g' \ + ${REINPLACE_CMD} -e 's,/usr/share/,${PREFIX}/share/,g' \ ${WRKSRC}/pfaedit/pfaedit.1 - ${PERL} -pi.orig -e 's,/usr/pkg/,${PREFIX}/,g' \ - ${WRKSRC}/*/[mM]akefile.* + ${REINPLACE_CMD} -e 's,/usr/pkg/,${PREFIX}/,g' ${WRKSRC}/*/[mM]akefile.* post-install: ${MKDIR} ${DOCSDIR} diff --git a/print/pfaedit/distinfo b/print/pfaedit/distinfo index f346410bbeb9..b354b8e80c64 100644 --- a/print/pfaedit/distinfo +++ b/print/pfaedit/distinfo @@ -1,3 +1,3 @@ -MD5 (pfaedit_full-020518.tgz) = aca03856c22eaa7af4245fba7c88f4af +MD5 (pfaedit_full-020627.tgz) = e5e406e8435f564fcc0b12bb674d18dd MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f -MD5 (pfaedit_htdocs-020416.tgz) = df31ad47fbbab26642550bc91ab52478 +MD5 (pfaedit_htdocs-020626.tgz) = cb0fab49be57efbd42c755255f2cce5a diff --git a/print/pfaedit/files/patch-Makefile.in b/print/pfaedit/files/patch-Makefile.in index 91d5f26e1f21..667df5cdefde 100644 --- a/print/pfaedit/files/patch-Makefile.in +++ b/print/pfaedit/files/patch-Makefile.in @@ -1,22 +1,22 @@ ---- Makefile.in.orig Sat Mar 16 08:43:35 2002 -+++ Makefile.in Sun May 12 18:02:27 2002 -@@ -37,15 +37,15 @@ +--- Makefile.in.orig Sat Jun 29 10:17:51 2002 ++++ Makefile.in Sat Jun 29 10:19:57 2002 +@@ -39,15 +39,15 @@ mkdir -p $(bindir) mkdir -p $(mandir)/man1 mkdir -p $(sharedir) - cp pfaedit/pfaedit $(bindir) - cp pfaedit/sfddiff $(bindir) -- cp pfaedit/pfaedit.*.ui $(sharedir) +- cp pfaedit/pfaedit-*.ui $(sharedir) + ${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir) + ${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir) -+ ${BSD_INSTALL_DATA} pfaedit/pfaedit.*.ui $(sharedir) ++ ${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) ++ ${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/pfaedit/pkg-plist b/print/pfaedit/pkg-plist index 6e30938b78d3..6f5bbf0ce3a7 100644 --- a/print/pfaedit/pkg-plist +++ b/print/pfaedit/pkg-plist @@ -5,6 +5,7 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png %%PORTDOCS%%share/doc/pfaedit/Anna.gif %%PORTDOCS%%share/doc/pfaedit/Antigone.gif +%%PORTDOCS%%share/doc/pfaedit/BDFgrey.html %%PORTDOCS%%share/doc/pfaedit/BitmapView.png %%PORTDOCS%%share/doc/pfaedit/C1.png %%PORTDOCS%%share/doc/pfaedit/C10.png @@ -51,6 +52,9 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/Print.png %%PORTDOCS%%share/doc/pfaedit/Problems-MacOSX.html %%PORTDOCS%%share/doc/pfaedit/ReviewHints.png +%%PORTDOCS%%share/doc/pfaedit/Shades.png +%%PORTDOCS%%share/doc/pfaedit/Shades2.png +%%PORTDOCS%%share/doc/pfaedit/Shades4.png %%PORTDOCS%%share/doc/pfaedit/Spacem_1.png %%PORTDOCS%%share/doc/pfaedit/Spacem_2.png %%PORTDOCS%%share/doc/pfaedit/aacutebase.png @@ -105,6 +109,8 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/fontview.ru.png %%PORTDOCS%%share/doc/pfaedit/future.html %%PORTDOCS%%share/doc/pfaedit/getinfo.html +%%PORTDOCS%%share/doc/pfaedit/greymapedit.png +%%PORTDOCS%%share/doc/pfaedit/greymapsavail.png %%PORTDOCS%%share/doc/pfaedit/helpmenu.html %%PORTDOCS%%share/doc/pfaedit/hexley.png %%PORTDOCS%%share/doc/pfaedit/hinting.html @@ -115,6 +121,7 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/layers.png %%PORTDOCS%%share/doc/pfaedit/license.html %%PORTDOCS%%share/doc/pfaedit/locale.html +%%PORTDOCS%%share/doc/pfaedit/logo3.gif %%PORTDOCS%%share/doc/pfaedit/macformats.html %%PORTDOCS%%share/doc/pfaedit/metricsmenu.html %%PORTDOCS%%share/doc/pfaedit/metricsview.html @@ -137,7 +144,10 @@ bin/sfddiff %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png %%PORTDOCS%%share/doc/pfaedit/problems.html %%PORTDOCS%%share/doc/pfaedit/quotations.html +%%PORTDOCS%%share/doc/pfaedit/rplref.png +%%PORTDOCS%%share/doc/pfaedit/rplserifs.png %%PORTDOCS%%share/doc/pfaedit/scripting.html +%%PORTDOCS%%share/doc/pfaedit/search.html %%PORTDOCS%%share/doc/pfaedit/serif.png %%PORTDOCS%%share/doc/pfaedit/serif2.png %%PORTDOCS%%share/doc/pfaedit/setwidth.png @@ -163,9 +173,9 @@ share/pfaedit/Adobe-Identity-0.cidmap share/pfaedit/Adobe-Japan1-4.cidmap share/pfaedit/Adobe-Japan2-0.cidmap share/pfaedit/Adobe-Korea1-2.cidmap -share/pfaedit/pfaedit.de.ui -share/pfaedit/pfaedit.en.ui -share/pfaedit/pfaedit.fr.ui -share/pfaedit/pfaedit.ru.ui +share/pfaedit/pfaedit-de.ui +share/pfaedit/pfaedit-en.ui +share/pfaedit/pfaedit-fr.ui +share/pfaedit/pfaedit-ru.ui @dirrm share/pfaedit %%PORTDOCS%%@dirrm share/doc/pfaedit |