diff options
author | joerg <joerg@pkgsrc.org> | 2006-11-06 11:25:24 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-11-06 11:25:24 +0000 |
commit | f9e5792fb58eb8f1164e6efdd9c6cbc5d2cd8d5e (patch) | |
tree | 37322b11b10518af6330599c95b81ae8b8205e3d | |
parent | 4fb0965f6f32c061ee4138e3ca0a99ebd6271d26 (diff) | |
download | pkgsrc-f9e5792fb58eb8f1164e6efdd9c6cbc5d2cd8d5e.tar.gz |
DESTDIR support and switch to modular buildlinks.
-rw-r--r-- | fonts/t1lib/Makefile | 24 | ||||
-rw-r--r-- | fonts/t1lib/distinfo | 3 | ||||
-rw-r--r-- | fonts/t1lib/patches/patch-ab | 13 |
3 files changed, 29 insertions, 11 deletions
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile index 73d3f8f867d..84050029155 100644 --- a/fonts/t1lib/Makefile +++ b/fonts/t1lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/04/08 07:21:28 reed Exp $ +# $NetBSD: Makefile,v 1.33 2006/11/06 11:25:24 joerg Exp $ DISTNAME= t1lib-5.1.0 PKGREVISION= 5 @@ -9,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Library for generating bitmaps from Adobe Type 1 fonts PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes USE_TOOLS+= gmake @@ -22,7 +23,7 @@ DATADIR= ${PREFIX}/share/${PKGBASE} CONF_FILES= ${EGDIR}/t1lib.config.sample ${DATADIR}/t1lib.config CONF_FILES+= ${EGDIR}/FontDataBase ${DATADIR}/FontDataBase -.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" SUBST_CLASSES+= paths SUBST_FILES.paths= t1lib.config.sample @@ -37,16 +38,19 @@ pre-build: ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} post-install: - ${INSTALL_DATA_DIR} ${DATADIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR} cd ${WRKSRC}; \ - ${PAX} -rw Fonts ${DATADIR}; \ - ${CHMOD} go+r ${DATADIR}/Fonts/enc/IsoLatin2.enc; \ - ${PAX} -rw -s "/doc/${PKGBASE}/" doc ${PREFIX}/share/doc + ${PAX} -rw Fonts ${DESTDIR}${DATADIR}; \ + ${CHMOD} go+r ${DESTDIR}${DATADIR}/Fonts/enc/IsoLatin2.enc; \ + ${PAX} -rw -s "/doc/${PKGBASE}/" doc ${DESTDIR}${PREFIX}/share/doc - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/t1lib.config.sample ${EGDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/t1lib.config.sample ${DESTDIR}${EGDIR} cd ${WRKSRC}/examples; \ - ${PAX} -rw FontDataBase t1example1.c t1lib.config ${EGDIR} + ${PAX} -rw FontDataBase t1example1.c t1lib.config ${DESTDIR}${EGDIR} -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo index 0a853c830d8..8164490ed16 100644 --- a/fonts/t1lib/distinfo +++ b/fonts/t1lib/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.14 2005/09/09 16:59:55 tonio Exp $ +$NetBSD: distinfo,v 1.15 2006/11/06 11:25:24 joerg Exp $ SHA1 (t1lib-5.1.0.tar.gz) = 6866561027aa32b0efb1a1aad0aa38cb5e01a299 RMD160 (t1lib-5.1.0.tar.gz) = f12710159aa8a92e8feb5d934dc45875d198bb58 Size (t1lib-5.1.0.tar.gz) = 1838635 bytes SHA1 (patch-aa) = 068c25f733c3037faa5051b527b1e1637d706a20 +SHA1 (patch-ab) = ccc3d498cfd94f1ebe54be8f10384cdd94c6ebf8 SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c diff --git a/fonts/t1lib/patches/patch-ab b/fonts/t1lib/patches/patch-ab new file mode 100644 index 00000000000..045647ce935 --- /dev/null +++ b/fonts/t1lib/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.5 2006/11/06 11:25:24 joerg Exp $ + +--- type1afm/Makefile.in.orig 2006-11-04 01:08:30.000000000 +0000 ++++ type1afm/Makefile.in +@@ -89,7 +89,7 @@ clean: dummy + install: dummy + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install \ +- $(INSTALL_PROGRAM) type1afm $(bindir)/type1afm ++ $(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm + + + uninstall: dummy |