diff options
| -rw-r--r-- | chat/zephyr/Makefile | 16 | ||||
| -rw-r--r-- | chat/zephyr/distinfo | 4 | ||||
| -rw-r--r-- | chat/zephyr/patches/patch-ai | 11 | ||||
| -rw-r--r-- | sysutils/wtail/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/wtail/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/wtail/patches/patch-aa | 20 |
6 files changed, 30 insertions, 28 deletions
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile index 84142f86b5e..1ed18722a7d 100644 --- a/chat/zephyr/Makefile +++ b/chat/zephyr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/05/20 00:58:08 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2009/10/29 21:53:10 tnn Exp $ # DISTNAME= zephyr-20010518 @@ -10,6 +10,8 @@ MAINTAINER= sommerfeld@NetBSD.org HOMEPAGE= http://web.mit.edu/olh/Zephyr/index.html COMMENT= Project Athena's original Instant Messaging system +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/zephyr GNU_CONFIGURE= YES @@ -33,11 +35,17 @@ CONF_FILES= ${EGDIR}/default.subscriptions \ RCD_SCRIPTS= zhm +SUBST_CLASSES+= mandir +SUBST_STAGE.mandir= pre-configure +SUBST_MESSAGE.mandir= Fixing mandir in Makefile.in +SUBST_FILES.mandir= */*/Makefile.in */Makefile.in Makefile.in +SUBST_SED.mandir= -e 's,$${prefix}/man,@mandir@,g' + pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${ZEPHYR_DOCDIR} .for f in ${ZEPHYR_DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${ZEPHYR_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${ZEPHYR_DOCDIR} .endfor .include "../../devel/readline/buildlink3.mk" diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo index 720ebd9d2f8..0d6df02716c 100644 --- a/chat/zephyr/distinfo +++ b/chat/zephyr/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2009/09/23 13:31:31 tnn Exp $ +$NetBSD: distinfo,v 1.6 2009/10/29 21:53:10 tnn Exp $ SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0 @@ -10,7 +10,7 @@ SHA1 (patch-ae) = e0d0776b891db5b8542285899e22c886337cc6c7 SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147 SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207 -SHA1 (patch-ai) = 2e6a35f15cca8912ddbda5c2aad73102be01be4a +SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28 SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236 SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17 SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8 diff --git a/chat/zephyr/patches/patch-ai b/chat/zephyr/patches/patch-ai index 79d1cc43457..9bdd167d542 100644 --- a/chat/zephyr/patches/patch-ai +++ b/chat/zephyr/patches/patch-ai @@ -1,16 +1,7 @@ -$NetBSD: patch-ai,v 1.2 2009/09/23 13:31:32 tnn Exp $ +$NetBSD: patch-ai,v 1.3 2009/10/29 21:53:10 tnn Exp $ --- Makefile.in.orig 1998-06-11 21:10:02.000000000 +0200 +++ Makefile.in -@@ -7,7 +7,7 @@ sysconfdir=@sysconfdir@ - sbindir=@sbindir@ - - includedir=${prefix}/include --mandir=${prefix}/man -+mandir=${prefix}/${PKGMANDIR} - bindir=${exec_prefix}/bin - libdir=${exec_prefix}/lib - @@ -31,8 +31,6 @@ install: ${ENSUREDIR} ${DESTDIR}${libdir} 755 ${ENSUREDIR} ${DESTDIR}${datadir} 755 diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile index d9ad13fe23d..931d8011986 100644 --- a/sysutils/wtail/Makefile +++ b/sysutils/wtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:43 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2009/10/29 21:58:38 tnn Exp $ # DISTNAME= wtail-0.2.2 @@ -10,6 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/ COMMENT= Watch multiple files at once +PKG_DESTDIR_SUPPORT= user-destdir MAKE_ENV+= SED=${SED:Q} diff --git a/sysutils/wtail/distinfo b/sysutils/wtail/distinfo index e913b9e64b7..3b00602b6d5 100644 --- a/sysutils/wtail/distinfo +++ b/sysutils/wtail/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:40:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2009/10/29 21:58:38 tnn Exp $ SHA1 (wtail-0.2.2.tar.gz) = 609f4ebe064c155829e96f865bee93e727b692e8 RMD160 (wtail-0.2.2.tar.gz) = cb118254ef80c2a26d0ce2b482ca6b64d0401417 Size (wtail-0.2.2.tar.gz) = 13633 bytes -SHA1 (patch-aa) = 1605c1836fddce4c3fef589e3cf5a11d6bab33d6 +SHA1 (patch-aa) = b37d9383f512c3e14fb590d6f07b8e2fbb12ad00 diff --git a/sysutils/wtail/patches/patch-aa b/sysutils/wtail/patches/patch-aa index 81252469b9e..524bccf9f81 100644 --- a/sysutils/wtail/patches/patch-aa +++ b/sysutils/wtail/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $ +$NetBSD: patch-aa,v 1.2 2009/10/29 21:58:38 tnn Exp $ ---- Makefile.orig Tue Jan 14 00:12:57 2003 -+++ Makefile Sun Feb 16 01:09:18 2003 +--- Makefile.orig 2003-01-14 00:12:57.000000000 +0100 ++++ Makefile @@ -5,7 +5,7 @@ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $ TMPDIR = ~/tmp # Variables that you probably don't want to modify -@@ -22,12 +22,12 @@ +@@ -22,12 +22,14 @@ clean: rm -f $(OBJ) wtail install: @@ -21,16 +21,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $ - mkdir -p "$(MAN)"/man1 - sed 's/@{VERSION}/'$(VERSION)'/g' wtail.1 >"$(MAN)"/man1/wtail.1 - touch -r wtail.1 "$(MAN)"/man1/wtail.1 -+ ${BSD_INSTALL_PROGRAM} wtail $(PREFIX)/bin/ ++ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_PROGRAM} wtail $(DESTDIR)$(PREFIX)/bin + ${SED} 's/@{VERSION}/'$(VERSION)'/g' wtail.1 > wtail.1.fixed -+ ${BSD_INSTALL_MAN} wtail.1.fixed $(PREFIX)/man/man1/wtail.1 -+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/doc/wtail ++ ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 ++ ${BSD_INSTALL_MAN} wtail.1.fixed $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/wtail.1 ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/doc/wtail + ${BSD_INSTALL_DATA} README CHANGES COPYING FAQ VERSION \ -+ $(PREFIX)/share/doc/wtail/ ++ $(DESTDIR)$(PREFIX)/share/doc/wtail/ test: chatter ./chatter /tmp/wtail.a /tmp/wtail.b /tmp/wtail.c \ -@@ -51,7 +51,7 @@ +@@ -51,7 +53,7 @@ dist: arc=$(ARC); cd $(TMPDIR) && tar -cf - $$arc | gzip >$$arc.tar.gz wtail: $(OBJ) |