From 8c85c5dd36f990ff81dd78b07127897e41f59e05 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 10 Feb 2009 00:25:00 +0000 Subject: DESTDIR support. --- archivers/dact/Makefile | 3 ++- archivers/dact/distinfo | 4 ++-- archivers/dact/patches/patch-aa | 33 ++++++++++++++++++++++++--------- pkgtools/rc.subr/Makefile | 27 +++++++++++++-------------- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 2be4ce511d8..f5108864796 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/08/31 06:39:11 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2009/02/10 00:25:54 joerg Exp $ DISTNAME= dact-0.8.41 CATEGORIES= archivers @@ -9,6 +9,7 @@ HOMEPAGE= http://www.rkeene.org/devel/dact/ COMMENT= Dynamic adaptive compression tool PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/archivers/dact/distinfo b/archivers/dact/distinfo index 70e6da6fb12..3042eb1f717 100644 --- a/archivers/dact/distinfo +++ b/archivers/dact/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2006/08/30 15:34:34 rillig Exp $ +$NetBSD: distinfo,v 1.11 2009/02/10 00:25:54 joerg Exp $ SHA1 (dact-0.8.41.tar.gz) = a87db20ae7bf4ffd1b5d37c7e3be70c84661e379 RMD160 (dact-0.8.41.tar.gz) = 015544501df128da869f837b64579de53028a163 Size (dact-0.8.41.tar.gz) = 151032 bytes -SHA1 (patch-aa) = b1e4dbac8271ceaff320720923d0667907503588 +SHA1 (patch-aa) = 087545641533933b85446341161d4df41d05ab65 SHA1 (patch-ab) = 4bb63e9e9ae2cf1a4faf06bfad20c0f47a4c46a2 diff --git a/archivers/dact/patches/patch-aa b/archivers/dact/patches/patch-aa index 6495c29e0bc..3d4e33d75c4 100644 --- a/archivers/dact/patches/patch-aa +++ b/archivers/dact/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2006/08/30 15:34:34 rillig Exp $ +$NetBSD: patch-aa,v 1.7 2009/02/10 00:25:54 joerg Exp $ --- Makefile.in.orig 2006-03-25 14:15:04.000000000 +0100 -+++ Makefile.in 2006-08-30 17:31:54.649362344 +0200 ++++ Makefile.in @@ -42,15 +42,15 @@ OBJS += dact_common.o comp_fail.o comp_p SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ @@ -30,20 +30,35 @@ $NetBSD: patch-aa,v 1.6 2006/08/30 15:34:34 rillig Exp $ dact$(EXEEXT): $(OBJS) $(MODS) $(CC) $(OBJS) $(LIBS) -o dact$(EXEEXT) $(LDLIBS) $(LDFLAGS) -@@ -101,14 +101,9 @@ install: all install-bin - -$(INSTALL) -d $(libdir) - -$(INSTALL) -d $(datadir)/dact - -$(INSTALL) -d $(sysconfdir) +@@ -93,22 +93,17 @@ mrproper: distclean + rm -rf Makefile.dep configure autom4te.cache/ config.h.in + + install-bin: dact$(EXEEXT) +- -$(INSTALL) -d $(bindir) +- $(INSTALL) -m 755 dact$(EXEEXT) $(bindir)/dact$(EXEEXT) ++ -$(INSTALL) -d ${DESTDIR}$(bindir) ++ $(INSTALL) -m 755 dact$(EXEEXT) ${DESTDIR}$(bindir)/dact$(EXEEXT) + + install: all install-bin +- -$(INSTALL) -d $(mandir)/man1 +- -$(INSTALL) -d $(libdir) +- -$(INSTALL) -d $(datadir)/dact +- -$(INSTALL) -d $(sysconfdir) - $(INSTALL) -m 644 dact.conf $(CONF) -+ $(INSTALL) -m 644 dact.conf $(datadir)/examples/dact - $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1 +- $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1 - -$(INSTALL) -m 755 libdact.$(SHOBJEXT) $(libdir)/libdact.$(SHOBJEXT) - -$(INSTALL) -m 644 libdact.$(SHOBJEXT).def $(libdir)/libdact.$(SHOBJEXT).def - -$(INSTALL) -m 644 libdact.$(SHOBJEXT).a $(libdir)/libdact.$(SHOBJEXT).a - -$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a -@MODS@ for so in $(MODS); do $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done - ./patch-magic-file $(datadir)/magic -+@MODS@ for so in :dummy: $(MODS); do case $$so in :dummy:) continue;; esac; $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done ++ -$(INSTALL) -d ${DESTDIR}$(mandir)/man1 ++ -$(INSTALL) -d ${DESTDIR}$(libdir) ++ -$(INSTALL) -d ${DESTDIR}$(datadir)/dact ++ -$(INSTALL) -d ${DESTDIR}$(sysconfdir) ++ $(INSTALL) -m 644 dact.conf ${DESTDIR}$(datadir)/examples/dact ++ $(INSTALL) -m 644 Docs/dact.1 ${DESTDIR}$(mandir)/man1/dact.1 ++@MODS@ for so in :dummy: $(MODS); do case $$so in :dummy:) continue;; esac; $(INSTALL) -m 755 $$so ${DESTDIR}$(datadir)/dact/$$so; done install-bin-local: dact$(EXEEXT) -$(INSTALL) -d $(HOME)/.dact/`uname -s | tr A-Z a-z`-`uname -m` diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile index beec932c676..a0f33517bd7 100644 --- a/pkgtools/rc.subr/Makefile +++ b/pkgtools/rc.subr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/01/18 22:35:35 shattered Exp $ +# $NetBSD: Makefile,v 1.20 2009/02/10 00:25:00 joerg Exp $ # DISTNAME= rc.subr-20090118 @@ -10,14 +10,14 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://www.NetBSD.org/ COMMENT= Portable NetBSD rc.subr implementation for pkgsrc -ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-[0-4].*-* Interix-*-* -ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-* -ONLY_FOR_PLATFORM+= QNX-*-* +PKG_DESTDIR_SUPPORT= user-destdir + +#ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-[0-4].*-* Interix-*-* +#ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-* +#ONLY_FOR_PLATFORM+= QNX-*-* NO_BUILD= yes -NO_CHECKSUM= yes NO_CONFIGURE= yes -NO_MTREE= yes CHECK_FILES_SUPPORTED= no @@ -25,19 +25,18 @@ PLIST_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:S/^\///} CONF_FILES+= ${PREFIX}etc/rc.conf.example ${PREFIX}etc/rc.conf -INSTALLATION_DIRS= etc +INSTALLATION_DIRS= etc ${RCD_SCRIPTS_DIR:S/^\///} do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} do-install: - ${INSTALL_DATA_DIR} ${PREFIX}${RCD_SCRIPTS_DIR} - ${INSTALL_DATA} ${WRKSRC}/rc.conf.example ${PREFIX}etc/rc.conf.example - ${INSTALL_DATA} ${WRKSRC}/rc.subr ${PREFIX}etc/rc.subr - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${PREFIX}${RCD_SCRIPTS_DIR} - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${PREFIX}${RCD_SCRIPTS_DIR} - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${PREFIX}${RCD_SCRIPTS_DIR} - ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${PREFIX}${RCD_SCRIPTS_DIR} + ${INSTALL_DATA} ${WRKSRC}/rc.conf.example ${DESTDIR}${PREFIX}etc/rc.conf.example + ${INSTALL_DATA} ${WRKSRC}/rc.subr ${DESTDIR}${PREFIX}etc/rc.subr + ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${DESTDIR}${PREFIX}${RCD_SCRIPTS_DIR} + ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${DESTDIR}${PREFIX}${RCD_SCRIPTS_DIR} + ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${DESTDIR}${PREFIX}${RCD_SCRIPTS_DIR} + ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${DESTDIR}${PREFIX}${RCD_SCRIPTS_DIR} .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3