summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fonts/t1lib/Makefile28
-rw-r--r--fonts/t1lib/PLIST180
-rw-r--r--fonts/t1lib/buildlink.mk4
-rw-r--r--fonts/t1lib/buildlink2.mk4
-rw-r--r--fonts/t1lib/distinfo7
-rw-r--r--fonts/t1lib/files/t1lib.config.netbsd7
-rw-r--r--fonts/t1lib/files/t1lib.config.sample7
-rw-r--r--fonts/t1lib/patches/patch-aa21
8 files changed, 140 insertions, 118 deletions
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 1019d463443..07fdf352fa5 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,45 +1,43 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 00:51:21 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/19 01:26:41 jlam Exp $
#
-DISTNAME= t1lib-1.1.1
-WRKSRC= ${WRKDIR}/T1-1.1.1
+DISTNAME= t1lib-1.3.1
CATEGORIES= fonts devel graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/graphics/} \
- ftp://ftp.neuroinformatik.ruhr-uni-bochum.de/pub/software/t1lib/
+ ftp://ftp.foolabs.com/pub/xpdf/
MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1lib.html
-COMMENT= Library for generating bitmaps from Adobe Type 1 fonts
+COMMENT= library for generating bitmaps from Adobe Type 1 fonts
USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
USE_GMAKE= # defined
-USE_X11BASE= # defined
+GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+LTCONFIG_OVERRIDE= ${WRKSRC}/ac-tools/ltconfig
ALL_TARGET= without_doc
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
DATADIR= ${PREFIX}/share/${PKGBASE}
-CONF_FILES= ${EGDIR}/t1lib.config.netbsd ${DATADIR}/t1lib.config
+CONF_FILES= ${EGDIR}/t1lib.config.sample ${DATADIR}/t1lib.config
CONF_FILES+= ${EGDIR}/FontDataBase ${DATADIR}/FontDataBase
+pre-build:
+ ${FIND} ${WRKSRC} -name "*.orig" | ${XARGS} ${RM}
+
post-install:
${INSTALL_DATA_DIR} ${DATADIR}
cd ${WRKSRC}; \
${PAX} -rw Fonts ${DATADIR}; \
${CHMOD} go+r ${DATADIR}/Fonts/enc/IsoLatin2.enc; \
- ${PAX} -rw -s "/doc/t1lib/" doc ${PREFIX}/share/doc
+ ${PAX} -rw -s "/doc/${PKGBASE}/" doc ${PREFIX}/share/doc
${INSTALL_DATA_DIR} ${EGDIR}
cd ${WRKSRC}/examples; \
${PAX} -rw FontDataBase t1example1.c t1lib.config ${EGDIR}
- ${SED} -e "s|@@X11BASE@@|${X11BASE}|g" \
- -e "s|@@LOCALBASE@@|${LOCALBASE}|g" \
- -e "s|@@PREFIX@@|${PREFIX}|g" \
- ${FILESDIR}/t1lib.config.netbsd > ${EGDIR}/t1lib.config.netbsd
+ ${SED} ${FILES_SUBST_SED} \
+ ${FILESDIR}/t1lib.config.sample > ${EGDIR}/t1lib.config.sample
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/t1lib/PLIST b/fonts/t1lib/PLIST
index 2377da36cd3..afb9c72805a 100644
--- a/fonts/t1lib/PLIST
+++ b/fonts/t1lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/19 00:51:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/19 01:26:41 jlam Exp $
bin/type1afm
bin/xglyph
include/t1lib.h
@@ -6,95 +6,97 @@ include/t1libx.h
lib/libt1.a
lib/libt1.la
lib/libt1.so
-lib/libt1.so.2
-lib/libt1.so.2.1
+lib/libt1.so.4
+lib/libt1.so.4.1
lib/libt1x.a
lib/libt1x.la
lib/libt1x.so
-lib/libt1x.so.2
-lib/libt1x.so.2.1
-share/doc/t1lib/Makefile.in
-share/doc/t1lib/Tee.eps
-share/doc/t1lib/Tee.pdf
-share/doc/t1lib/arbitrary.eps
-share/doc/t1lib/arbitrary.pdf
-share/doc/t1lib/concatglyphs.eps
-share/doc/t1lib/concatglyphs.pdf
-share/doc/t1lib/concatoutlines.eps
-share/doc/t1lib/concatoutlines.pdf
-share/doc/t1lib/extenth.eps
-share/doc/t1lib/extenth.pdf
-share/doc/t1lib/extentv.eps
-share/doc/t1lib/extentv.pdf
-share/doc/t1lib/getstart.tex
-share/doc/t1lib/internals.tex
-share/doc/t1lib/intro.tex
-share/doc/t1lib/manipulate.eps
-share/doc/t1lib/manipulate.pdf
-share/doc/t1lib/mirrorh.eps
-share/doc/t1lib/mirrorh.pdf
-share/doc/t1lib/mirrorv.eps
-share/doc/t1lib/mirrorv.pdf
-share/doc/t1lib/outlineproblems1.eps
-share/doc/t1lib/outlineproblems1.pdf
-share/doc/t1lib/outlineproblems2.eps
-share/doc/t1lib/outlineproblems2.pdf
-share/doc/t1lib/outlineproblems3.eps
-share/doc/t1lib/outlineproblems3.pdf
-share/doc/t1lib/outlineproblems4.eps
-share/doc/t1lib/outlineproblems4.pdf
-share/doc/t1lib/outlineproblems5.eps
-share/doc/t1lib/outlineproblems5.pdf
-share/doc/t1lib/outlines.eps
-share/doc/t1lib/outlines.fig
-share/doc/t1lib/outlines.pdf
-share/doc/t1lib/rotate.eps
-share/doc/t1lib/rotate.pdf
-share/doc/t1lib/shearh.eps
-share/doc/t1lib/shearh.pdf
-share/doc/t1lib/shearv.eps
-share/doc/t1lib/shearv.pdf
-share/doc/t1lib/t1_data.eps
-share/doc/t1lib/t1_data.fig
-share/doc/t1lib/t1_data.pdf
-share/doc/t1lib/t1lib_doc.out
-share/doc/t1lib/t1lib_doc.pdf
-share/doc/t1lib/t1lib_doc.tex
-share/doc/t1lib/type1afm.tex
-share/doc/t1lib/ut1lib.tex
-share/doc/t1lib/xglyph.tex
-share/doc/t1lib/xinterface.tex
-share/examples/t1lib/FontDataBase
-share/examples/t1lib/t1example1.c
-share/examples/t1lib/t1lib.config
-share/examples/t1lib/t1lib.config.netbsd
-share/t1lib/Fonts/afm/README
-share/t1lib/Fonts/afm/bchb.afm
-share/t1lib/Fonts/afm/bchbi.afm
-share/t1lib/Fonts/afm/bchr.afm
-share/t1lib/Fonts/afm/bchri.afm
-share/t1lib/Fonts/afm/dcbx10.afm
-share/t1lib/Fonts/afm/dcbxti10.afm
-share/t1lib/Fonts/afm/dcr10.afm
-share/t1lib/Fonts/afm/dcti10.afm
-share/t1lib/Fonts/afm/eufm10.afm
-share/t1lib/Fonts/enc/IsoLatin1.enc
-share/t1lib/Fonts/enc/IsoLatin2.enc
-share/t1lib/Fonts/enc/PSLatin1.enc
-share/t1lib/Fonts/type1/README
-share/t1lib/Fonts/type1/bchb.pfb
-share/t1lib/Fonts/type1/bchbi.pfb
-share/t1lib/Fonts/type1/bchr.pfb
-share/t1lib/Fonts/type1/bchri.pfb
-share/t1lib/Fonts/type1/dcbx10.pfb
-share/t1lib/Fonts/type1/dcbxti10.pfb
-share/t1lib/Fonts/type1/dcr10.pfb
-share/t1lib/Fonts/type1/dcti10.pfb
-share/t1lib/Fonts/type1/eufm10.pfb
-@dirrm share/t1lib/Fonts/type1
-@dirrm share/t1lib/Fonts/enc
-@dirrm share/t1lib/Fonts/afm
-@dirrm share/t1lib/Fonts
-@dirrm share/examples/t1lib
+lib/libt1x.so.4
+lib/libt1x.so.4.1
+share/doc/${PKGBASE}/Makefile
+share/doc/${PKGBASE}/Makefile.in
+share/doc/${PKGBASE}/Tee.eps
+share/doc/${PKGBASE}/Tee.pdf
+share/doc/${PKGBASE}/arbitrary.eps
+share/doc/${PKGBASE}/arbitrary.pdf
+share/doc/${PKGBASE}/concatglyphs.eps
+share/doc/${PKGBASE}/concatglyphs.pdf
+share/doc/${PKGBASE}/concatoutlines.eps
+share/doc/${PKGBASE}/concatoutlines.pdf
+share/doc/${PKGBASE}/extenth.eps
+share/doc/${PKGBASE}/extenth.pdf
+share/doc/${PKGBASE}/extentv.eps
+share/doc/${PKGBASE}/extentv.pdf
+share/doc/${PKGBASE}/getstart.tex
+share/doc/${PKGBASE}/internals.tex
+share/doc/${PKGBASE}/intro.tex
+share/doc/${PKGBASE}/manipulate.eps
+share/doc/${PKGBASE}/manipulate.pdf
+share/doc/${PKGBASE}/mirrorh.eps
+share/doc/${PKGBASE}/mirrorh.pdf
+share/doc/${PKGBASE}/mirrorv.eps
+share/doc/${PKGBASE}/mirrorv.pdf
+share/doc/${PKGBASE}/outlineproblems1.eps
+share/doc/${PKGBASE}/outlineproblems1.pdf
+share/doc/${PKGBASE}/outlineproblems2.eps
+share/doc/${PKGBASE}/outlineproblems2.pdf
+share/doc/${PKGBASE}/outlineproblems3.eps
+share/doc/${PKGBASE}/outlineproblems3.pdf
+share/doc/${PKGBASE}/outlineproblems4.eps
+share/doc/${PKGBASE}/outlineproblems4.pdf
+share/doc/${PKGBASE}/outlineproblems5.eps
+share/doc/${PKGBASE}/outlineproblems5.pdf
+share/doc/${PKGBASE}/outlines.eps
+share/doc/${PKGBASE}/outlines.fig
+share/doc/${PKGBASE}/outlines.pdf
+share/doc/${PKGBASE}/rotate.eps
+share/doc/${PKGBASE}/rotate.pdf
+share/doc/${PKGBASE}/shearh.eps
+share/doc/${PKGBASE}/shearh.pdf
+share/doc/${PKGBASE}/shearv.eps
+share/doc/${PKGBASE}/shearv.pdf
+share/doc/${PKGBASE}/t1_data.eps
+share/doc/${PKGBASE}/t1_data.fig
+share/doc/${PKGBASE}/t1_data.pdf
+share/doc/${PKGBASE}/t1lib_doc.pdf
+share/doc/${PKGBASE}/t1lib_doc.tex
+share/doc/${PKGBASE}/type1afm.tex
+share/doc/${PKGBASE}/ut1lib.tex
+share/doc/${PKGBASE}/xglyph.tex
+share/doc/${PKGBASE}/xinterface.tex
+share/examples/${PKGBASE}/FontDataBase
+share/examples/${PKGBASE}/t1example1.c
+share/examples/${PKGBASE}/t1lib.config
+share/examples/${PKGBASE}/t1lib.config.sample
+share/${PKGBASE}/Fonts/afm/README
+share/${PKGBASE}/Fonts/afm/bchb.afm
+share/${PKGBASE}/Fonts/afm/bchbi.afm
+share/${PKGBASE}/Fonts/afm/bchr.afm
+share/${PKGBASE}/Fonts/afm/bchri.afm
+share/${PKGBASE}/Fonts/afm/dcbx10.afm
+share/${PKGBASE}/Fonts/afm/dcbxti10.afm
+share/${PKGBASE}/Fonts/afm/dcr10.afm
+share/${PKGBASE}/Fonts/afm/dcti10.afm
+share/${PKGBASE}/Fonts/afm/eufm10.afm
+share/${PKGBASE}/Fonts/enc/IsoLatin1.enc
+share/${PKGBASE}/Fonts/enc/IsoLatin2.enc
+share/${PKGBASE}/Fonts/enc/PSLatin1.enc
+share/${PKGBASE}/Fonts/enc/dc.enc
+share/${PKGBASE}/Fonts/enc/dvips.enc
+share/${PKGBASE}/Fonts/type1/README
+share/${PKGBASE}/Fonts/type1/bchb.pfb
+share/${PKGBASE}/Fonts/type1/bchbi.pfb
+share/${PKGBASE}/Fonts/type1/bchr.pfb
+share/${PKGBASE}/Fonts/type1/bchri.pfb
+share/${PKGBASE}/Fonts/type1/dcbx10.pfb
+share/${PKGBASE}/Fonts/type1/dcbxti10.pfb
+share/${PKGBASE}/Fonts/type1/dcr10.pfb
+share/${PKGBASE}/Fonts/type1/dcti10.pfb
+share/${PKGBASE}/Fonts/type1/eufm10.pfb
+@dirrm share/${PKGBASE}/Fonts/type1
+@dirrm share/${PKGBASE}/Fonts/enc
+@dirrm share/${PKGBASE}/Fonts/afm
+@dirrm share/${PKGBASE}/Fonts
+@dirrm share/examples/${PKGBASE}
@comment remove any rendered docs as well
-@unexec ${RM} -rf %D/share/doc/t1lib || ${TRUE}
+@@unexec ${RM} -rf %D/share/doc/${PKGBASE} || ${TRUE}
diff --git a/fonts/t1lib/buildlink.mk b/fonts/t1lib/buildlink.mk
index f00b5f6a528..ed33e19b102 100644
--- a/fonts/t1lib/buildlink.mk
+++ b/fonts/t1lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/09/19 01:26:42 jlam Exp $
#
# This Makefile fragment is included by packages that use t1lib.
#
@@ -17,7 +17,7 @@ T1LIB_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.t1lib?= t1lib>=1.1.1
+BUILDLINK_DEPENDS.t1lib?= t1lib>=1.3.1
DEPENDS+= ${BUILDLINK_DEPENDS.t1lib}:../../fonts/t1lib
EVAL_PREFIX+= BUILDLINK_PREFIX.t1lib=t1lib
diff --git a/fonts/t1lib/buildlink2.mk b/fonts/t1lib/buildlink2.mk
index 9e1b555d13f..7dfef667608 100644
--- a/fonts/t1lib/buildlink2.mk
+++ b/fonts/t1lib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/08/25 22:04:01 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/19 01:26:42 jlam Exp $
.if !defined(T1LIB_BUILDLINK2_MK)
T1LIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= t1lib
-BUILDLINK_DEPENDS.t1lib?= t1lib>=1.1.1
+BUILDLINK_DEPENDS.t1lib?= t1lib>=1.3.1
BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
EVAL_PREFIX+= BUILDLINK_PREFIX.t1lib=t1lib
diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo
index 6191518dcec..d0f407b463c 100644
--- a/fonts/t1lib/distinfo
+++ b/fonts/t1lib/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/19 01:26:42 jlam Exp $
-SHA1 (t1lib-1.1.1.tar.gz) = 5183f718dc0b90ff8c0aee4fbcfdbbc90e5db883
-Size (t1lib-1.1.1.tar.gz) = 1442934 bytes
+SHA1 (t1lib-1.3.1.tar.gz) = 01fba5a0c9249e69e6fd41d24641e85d17e94a26
+Size (t1lib-1.3.1.tar.gz) = 1528684 bytes
+SHA1 (patch-aa) = 1a09e0f8c3b35987a963bd73b2d18722c0a67fba
SHA1 (patch-ac) = a75f5dc4a4c5d8e564690b774345488383d21580
diff --git a/fonts/t1lib/files/t1lib.config.netbsd b/fonts/t1lib/files/t1lib.config.netbsd
deleted file mode 100644
index 2d8ce37761f..00000000000
--- a/fonts/t1lib/files/t1lib.config.netbsd
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: t1lib.config.netbsd,v 1.1.1.1 2002/07/19 12:37:41 wiz Exp $
-This is a configuration file for t1lib
-
-FONTDATABASE=@@PREFIX@@/share/t1lib/FontDataBase
-ENCODING=@@PREFIX@@/share/t1lib/Fonts/enc
-AFM=@@PREFIX@@/share/t1lib/Fonts/afm:@@LOCALBASE@@/share/ghostscript/fonts
-TYPE1=@@PREFIX@@/share/t1lib/Fonts/type1:/usr/share/groff_font/devps:@@LOCALBASE@@/share/ghostscript/fonts
diff --git a/fonts/t1lib/files/t1lib.config.sample b/fonts/t1lib/files/t1lib.config.sample
new file mode 100644
index 00000000000..2f2b83fbd81
--- /dev/null
+++ b/fonts/t1lib/files/t1lib.config.sample
@@ -0,0 +1,7 @@
+$NetBSD: t1lib.config.sample,v 1.1 2002/09/19 01:26:44 jlam Exp $
+This is a configuration file for t1lib
+
+FONTDATABASE=@PREFIX@/share/t1lib/FontDataBase
+ENCODING=@PREFIX@/share/t1lib/Fonts/enc
+AFM=@PREFIX@/share/t1lib/Fonts/afm:@LOCALBASE@/share/ghostscript/fonts
+TYPE1=@PREFIX@/share/t1lib/Fonts/type1:/usr/share/groff_font/devps:@LOCALBASE@/share/ghostscript/fonts
diff --git a/fonts/t1lib/patches/patch-aa b/fonts/t1lib/patches/patch-aa
new file mode 100644
index 00000000000..e33b73801f8
--- /dev/null
+++ b/fonts/t1lib/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2002/09/19 01:26:45 jlam Exp $
+
+--- doc/Makefile.in.orig Wed Sep 18 18:17:56 2002
++++ doc/Makefile.in
+@@ -89,16 +89,6 @@ clean: dummy
+
+
+ install: dummy
+- if (test -f t1lib_doc.ps) \
+- then \
+- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
+- $(INSTALL_DATA) t1lib_doc.ps @T1LIB_DATA_DIR@/doc; \
+- fi;
+- if (test -f t1lib_doc.pdf) \
+- then \
+- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
+- $(INSTALL_DATA) t1lib_doc.pdf @T1LIB_DATA_DIR@/doc; \
+- fi;
+
+
+ uninstall: dummy