[pkgsrc/trunk]: pkgsrc DESTDIR support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc DESTDIR support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:19:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfb75ab06c66
branches:  trunk
changeset: 554603:bfb75ab06c66
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 16 19:12:00 2009 +0000

description:
DESTDIR support

diffstat:

 ham/tfkiss/Makefile              |   4 +++-
 ham/tfkiss/distinfo              |   5 ++++-
 ham/tfkiss/patches/patch-ac      |  15 +++++++++++++++
 ham/tfkiss/patches/patch-ad      |  17 +++++++++++++++++
 ham/tfkiss/patches/patch-ae      |  17 +++++++++++++++++
 ham/tnt/Makefile                 |   3 ++-
 ham/tnt/distinfo                 |   3 ++-
 ham/tnt/patches/patch-ae         |  25 +++++++++++++++++++++++++
 sysutils/service-config/Makefile |  12 +++++++++++-
 www/cgilib/Makefile              |   4 +++-
 www/cgilib/distinfo              |   4 ++--
 www/cgilib/patches/patch-ab      |  22 +++++++++++-----------
 12 files changed, 112 insertions(+), 19 deletions(-)

diffs (254 lines):

diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tfkiss/Makefile
--- a/ham/tfkiss/Makefile       Mon Feb 16 19:09:17 2009 +0000
+++ b/ham/tfkiss/Makefile       Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/02/16 19:19:01 joerg Exp $
 #
 
 DISTNAME=      tfkiss-1.2.4
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.bfl.at/mayer/ham/
 COMMENT=       Software implementation of TheFirmware for use with TNT
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= yes
 
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tfkiss/distinfo
--- a/ham/tfkiss/distinfo       Mon Feb 16 19:09:17 2009 +0000
+++ b/ham/tfkiss/distinfo       Mon Feb 16 19:12:00 2009 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/12/30 23:06:43 joerg Exp $
+$NetBSD: distinfo,v 1.6 2009/02/16 19:19:01 joerg Exp $
 
 SHA1 (tfkiss-1.2.4.tar.gz) = 4bf8afb539fd155a86de439554f1b5b0ffd45343
 RMD160 (tfkiss-1.2.4.tar.gz) = b220afb5940e377957cfebfb8167f183202a89ab
 Size (tfkiss-1.2.4.tar.gz) = 142842 bytes
 SHA1 (patch-aa) = 25ff7b5753885826e12e53adc440bcba622d008a
 SHA1 (patch-ab) = 40ce8e60a0b85e260f0fd45739f2056066034f71
+SHA1 (patch-ac) = 09a09d4ad79043e744c47b74db5bea1a98a368f3
+SHA1 (patch-ad) = 5eee942e01f234a92d10da4147d6ef56ed462c9f
+SHA1 (patch-ae) = 57cd82b32738d5b483ad8182694c7da995cd1fda
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tfkiss/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/tfkiss/patches/patch-ac       Mon Feb 16 19:12:00 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/02/16 19:19:01 joerg Exp $
+
+--- src/Makefile.in.orig       2009-02-16 20:15:02.000000000 +0100
++++ src/Makefile.in
+@@ -72,8 +72,8 @@ tfkiss:              $(OBJS)
+               $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(LDFLAGS) -o tfkiss;
+ 
+ install:
+-              $(MKDIR) ${tfkiss_main_dir}/sbin; \
+-              $(INSTALL_PROGRAM) tfkiss ${tfkiss_main_dir}/sbin;
++              $(MKDIR) ${DESTDIR}${tfkiss_main_dir}/sbin; \
++              $(INSTALL_PROGRAM) tfkiss ${DESTDIR}${tfkiss_main_dir}/sbin;
+ 
+ clean:
+       rm -f   *.o *.core tfkiss .depend
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tfkiss/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/tfkiss/patches/patch-ad       Mon Feb 16 19:12:00 2009 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2009/02/16 19:19:01 joerg Exp $
+
+--- doc/Makefile.in.orig       2009-02-16 20:15:37.000000000 +0100
++++ doc/Makefile.in
+@@ -15,10 +15,10 @@ DOCS = alas.eng alas.txt copyrght.txt rf
+ all:
+ 
+ install:
+-      $(MKDIR) ${tfkiss_doc_dir}
++      $(MKDIR) ${DESTDIR}${tfkiss_doc_dir}
+       @for i in $(DOCS); \
+       do \
+-              $(INSTALL_DATA) $$i ${tfkiss_doc_dir}; \
++              $(INSTALL_DATA) $$i ${DESTDIR}${tfkiss_doc_dir}; \
+       done;
+ 
+ clean:
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tfkiss/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/tfkiss/patches/patch-ae       Mon Feb 16 19:12:00 2009 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2009/02/16 19:19:01 joerg Exp $
+
+--- examples/Makefile.in.orig  2009-02-16 20:16:44.000000000 +0100
++++ examples/Makefile.in
+@@ -15,10 +15,10 @@ CFGS = tfkiss.ini tfkiss.cfg
+ all:
+ 
+ install:
+-      $(MKDIR) ${tfkiss_conf_dir}
++      $(MKDIR) ${DESTDIR}${tfkiss_conf_dir}
+       @for i in $(CFGS); \
+       do \
+-              $(INSTALL_DATA) $$i ${tfkiss_conf_dir}; \
++              $(INSTALL_DATA) $$i ${DESTDIR}${tfkiss_conf_dir}; \
+       done;
+ 
+ clean:
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tnt/Makefile
--- a/ham/tnt/Makefile  Mon Feb 16 19:09:17 2009 +0000
+++ b/ham/tnt/Makefile  Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/12/09 13:08:42 obache Exp $
+# $NetBSD: Makefile,v 1.25 2009/02/16 19:20:16 joerg Exp $
 #
 
 DISTNAME=      tnt-1.9.2
@@ -12,6 +12,7 @@
 DEPENDS+=      dialog>=0.6z:../../misc/dialog
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=            gmake
 USE_PKGLOCALEDIR=      yes
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tnt/distinfo
--- a/ham/tnt/distinfo  Mon Feb 16 19:09:17 2009 +0000
+++ b/ham/tnt/distinfo  Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/12/09 13:08:42 obache Exp $
+$NetBSD: distinfo,v 1.9 2009/02/16 19:20:16 joerg Exp $
 
 SHA1 (tnt-1.9.2.tar.gz) = 8826e7e730c3440113bf723e18bb136e91cef8f8
 RMD160 (tnt-1.9.2.tar.gz) = 10e5812715d564f25797ff3d83124ad2b86f2a62
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = f2b6c9f22ffd4ef418f5aab6ca179d656e0a563c
 SHA1 (patch-ac) = 86865198639da69469c2766ec638898553eb7662
 SHA1 (patch-ad) = 1735028a7a52cc75f83a3f3c9fd29a06c9dd0153
+SHA1 (patch-ae) = 0f952e74159cd2eed714b7f3ab62bf54c9fbd177
diff -r 2dae31a3e840 -r bfb75ab06c66 ham/tnt/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/tnt/patches/patch-ae  Mon Feb 16 19:12:00 2009 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2009/02/16 19:20:16 joerg Exp $
+
+--- po/Makefile.in.in.orig     2009-02-16 20:17:28.000000000 +0100
++++ po/Makefile.in.in
+@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+       if test -r "$(MKINSTALLDIRS)"; then \
+-        $(MKINSTALLDIRS) $(datadir); \
++        $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
+       else \
+-        $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++        $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
+       fi
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+@@ -123,7 +123,7 @@ install-data-yes: all
+           *)     destdir=$(localedir);; \
+         esac; \
+         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+-        dir=$$destdir/$$lang/LC_MESSAGES; \
++        dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
+         if test -r "$(MKINSTALLDIRS)"; then \
+           $(MKINSTALLDIRS) $$dir; \
+         else \
diff -r 2dae31a3e840 -r bfb75ab06c66 sysutils/service-config/Makefile
--- a/sysutils/service-config/Makefile  Mon Feb 16 19:09:17 2009 +0000
+++ b/sysutils/service-config/Makefile  Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/23 00:58:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/16 19:12:00 joerg Exp $
 #
 
 DISTNAME=              service-config-0.51
@@ -9,10 +9,20 @@
 HOMEPAGE=              http://www.superscript.com/service-config/intro.html
 COMMENT=               Utility to create and configure svscan service directories
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
 
 # Possibly inherited DJB-style distribution terms
 DJB_RESTRICTED=                YES
 
+INSTALLATION_DIRS=     bin
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/rules-config ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/service-config ${DESTDIR}${PREFIX}/bin
+       cd ${WRKSRC} && ${INSTALL_SCRIPT} ipc-config ipcx-config \
+           svscan-config tcp-config tcpx-config ${DESTDIR}${PREFIX}/bin
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2dae31a3e840 -r bfb75ab06c66 www/cgilib/Makefile
--- a/www/cgilib/Makefile       Mon Feb 16 19:09:17 2009 +0000
+++ b/www/cgilib/Makefile       Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/07/09 21:51:30 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2009/02/16 19:16:57 joerg Exp $
 #
 
 DISTNAME=      cgilib-0.5
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.infodrom.org/projects/cgilib/
 COMMENT=       Common gateway interface library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 INSTALLATION_DIRS=     include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
 USE_LIBTOOL=   yes
 MAKE_ENV+=     MANDIR=${PREFIX}/${PKGMANDIR}
diff -r 2dae31a3e840 -r bfb75ab06c66 www/cgilib/distinfo
--- a/www/cgilib/distinfo       Mon Feb 16 19:09:17 2009 +0000
+++ b/www/cgilib/distinfo       Mon Feb 16 19:12:00 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/11/12 01:51:52 rillig Exp $
+$NetBSD: distinfo,v 1.12 2009/02/16 19:16:57 joerg Exp $
 
 SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
 RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63
 Size (cgilib-0.5.tar.gz) = 13991 bytes
 SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
-SHA1 (patch-ab) = 6b19c14f162f27171d3edc631baae610090c1baa
+SHA1 (patch-ab) = 4e38d2665e14d3271c3ac296f3853c2a100c7617
 SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728
 SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
diff -r 2dae31a3e840 -r bfb75ab06c66 www/cgilib/patches/patch-ab
--- a/www/cgilib/patches/patch-ab       Mon Feb 16 19:09:17 2009 +0000
+++ b/www/cgilib/patches/patch-ab       Mon Feb 16 19:12:00 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2006/11/12 01:51:52 rillig Exp $
+$NetBSD: patch-ab,v 1.10 2009/02/16 19:16:57 joerg Exp $
 
 --- Makefile.orig      1999-08-20 23:14:07.000000000 +0200
 +++ Makefile   2006-11-12 02:49:34.000000000 +0100
@@ -51,17 +51,17 @@
        done
 +
 +install:
-+      ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/cgilib
-+      ${BSD_INSTALL_DATA} cgitest.c ${PREFIX}/share/examples/cgilib
-+      ${BSD_INSTALL_DATA} jumpto.c ${PREFIX}/share/examples/cgilib
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${PREFIX}/lib
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${PREFIX}/libexec/cgi-bin
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${PREFIX}/libexec/cgi-bin
-+      ${BSD_INSTALL_DATA} cgi.h ${PREFIX}/include
++      ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/cgi-bin
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/cgilib
++      ${BSD_INSTALL_DATA} cgitest.c ${DESTDIR}${PREFIX}/share/examples/cgilib
++      ${BSD_INSTALL_DATA} jumpto.c ${DESTDIR}${PREFIX}/share/examples/cgilib
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${DESTDIR}${PREFIX}/lib
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${DESTDIR}${PREFIX}/libexec/cgi-bin
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${DESTDIR}${PREFIX}/libexec/cgi-bin
++      ${BSD_INSTALL_DATA} cgi.h ${DESTDIR}${PREFIX}/include
 +      for i in *.3; do \
-+          ${BSD_INSTALL_MAN} $$i ${MANDIR}/man3/; \
++          ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man3/; \
 +        done
 +      for i in *.5; do \
-+          ${BSD_INSTALL_MAN} $$i ${MANDIR}/man5/; \
++          ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man5/; \
 +        done
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/gtk-sharp update to 2.12.8
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils/hfsutils DESTDIR support
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtk-sharp update to 2.12.8
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/hfsutils DESTDIR support
Indexes:
Home | Main Index | Thread Index | Old Index