[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 08:54:51 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a84e7c64155
branches:  trunk
changeset: 570415:1a84e7c64155
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 29 16:08:17 2010 +0000

description:
DESTDIR support

diffstat:

 chat/xaric/Makefile                             |   7 ++++++-
 chat/xchat-systray-integration/Makefile         |   4 +++-
 chat/xchat-systray-integration/distinfo         |   4 ++--
 chat/xchat-systray-integration/patches/patch-aa |  10 +++++-----
 comms/conserver/Makefile                        |   7 +++----
 comms/efax-gtk/Makefile                         |   4 +++-
 comms/efax/Makefile                             |   6 +++++-
 comms/efax/distinfo                             |   4 ++--
 comms/efax/patches/patch-aa                     |  12 ++++++------
 9 files changed, 35 insertions(+), 23 deletions(-)

diffs (192 lines):

diff -r 049727227b38 -r 1a84e7c64155 chat/xaric/Makefile
--- a/chat/xaric/Makefile       Fri Jan 29 16:04:34 2010 +0000
+++ b/chat/xaric/Makefile       Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/28 20:56:59 zafer Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/29 16:08:17 joerg Exp $
 #
 
 DISTNAME=      xaric-0.12.1
@@ -10,9 +10,14 @@
 HOMEPAGE=      http://rf.cx/software/xaric/
 COMMENT=       IRC client similar to BitchX and ircII
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
 
 CONFIGURE_ARGS+=       --enable-optimize
 
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
+                       mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff -r 049727227b38 -r 1a84e7c64155 chat/xchat-systray-integration/Makefile
--- a/chat/xchat-systray-integration/Makefile   Fri Jan 29 16:04:34 2010 +0000
+++ b/chat/xchat-systray-integration/Makefile   Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:17 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/29 16:09:49 joerg Exp $
 
 DISTNAME=      xchat-systray-integration-2.4.5-src
 PKGNAME=       ${DISTNAME:S/-src//}
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.patriziobassi.it/blight/index.php?act=Systray
 COMMENT=       Systray icon plugin for XChat
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      xchat>=2.0:../../chat/xchat
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
diff -r 049727227b38 -r 1a84e7c64155 chat/xchat-systray-integration/distinfo
--- a/chat/xchat-systray-integration/distinfo   Fri Jan 29 16:04:34 2010 +0000
+++ b/chat/xchat-systray-integration/distinfo   Fri Jan 29 16:08:17 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/07/06 22:04:03 minskim Exp $
+$NetBSD: distinfo,v 1.7 2010/01/29 16:09:49 joerg Exp $
 
 SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
 RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab
 Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
-SHA1 (patch-aa) = 1afab689e88a6315201c3b1187dcdbbabc991ca8
+SHA1 (patch-aa) = f47cea4bd0fe7940813a5aa5c03e787320072161
 SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487
 SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f
 SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62
diff -r 049727227b38 -r 1a84e7c64155 chat/xchat-systray-integration/patches/patch-aa
--- a/chat/xchat-systray-integration/patches/patch-aa   Fri Jan 29 16:04:34 2010 +0000
+++ b/chat/xchat-systray-integration/patches/patch-aa   Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/29 16:09:49 joerg Exp $
 
 --- Makefile.orig      2004-04-30 05:38:10.000000000 -0700
 +++ Makefile
@@ -86,11 +86,11 @@
 -      $(install) src/images/Win32Tray $(plugindir)/ -r -f
 -      $(install) src/images/GTKTray $(plugindir)/ -r -f
 -      $(install) src/images/Menu $(plugindir)/ -r -f
-+      ${BSD_INSTALL_LIB_DIR} $(plugindir)
-+      ${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) $(plugindir)
++      ${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(plugindir)
++      ${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) ${DESTDIR}$(plugindir)
 +      for d in Win32Tray GTKTray Menu; do \
-+              ${BSD_INSTALL_DATA_DIR} ${plugindir}/$${d}; \
-+              ${BSD_INSTALL_DATA} src/images/$${d}/* ${plugindir}/$${d}; done
++              ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${plugindir}/$${d}; \
++              ${BSD_INSTALL_DATA} src/images/$${d}/* ${DESTDIR}${plugindir}/$${d}; done
        
  win-install:
        @echo 'Copy "Systray.dll" and "images" directory where you want. Set images directory in the settings tab'
diff -r 049727227b38 -r 1a84e7c64155 comms/conserver/Makefile
--- a/comms/conserver/Makefile  Fri Jan 29 16:04:34 2010 +0000
+++ b/comms/conserver/Makefile  Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:04 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2010/01/29 16:14:03 joerg Exp $
 #
 
 DISTNAME=      conserver-7.2.7
@@ -11,6 +11,7 @@
 COMMENT=       Application that allows multiple users to watch serial consoles
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= YES
 CONFLICTS+=    conserver8-[0-9]*
@@ -43,9 +44,7 @@
 SUBST_FILES.conf=      conserver.cf/conserver.cf
 SUBST_SED.conf=                -e s,/var/consoles,${VARBASE}/consoles,
 
-pre-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
+INSTALLATION_DIRS+=    ${EGDIR}
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 049727227b38 -r 1a84e7c64155 comms/efax-gtk/Makefile
--- a/comms/efax-gtk/Makefile   Fri Jan 29 16:04:34 2010 +0000
+++ b/comms/efax-gtk/Makefile   Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/01/29 16:17:33 joerg Exp $
 
 DISTNAME=      efax-gtk-3.0.20.src
 PKGNAME=       efax-gtk-3.0.20
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://efax-gtk.sourceforge.net/
 COMMENT=       GTK frontend for efax
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
diff -r 049727227b38 -r 1a84e7c64155 comms/efax/Makefile
--- a/comms/efax/Makefile       Fri Jan 29 16:04:34 2010 +0000
+++ b/comms/efax/Makefile       Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/04/12 23:04:21 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/29 16:14:29 joerg Exp $
 
 DISTNAME=      efax-0.9
 PKGREVISION=   1
@@ -9,10 +9,14 @@
 HOMEPAGE=      http://www.cce.com/efax/
 COMMENT=       Collection of small programs for sending and receiving faxes
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=     kdeutils<3.1
 
 CONF_FILES+=   ${PREFIX}/share/examples/efax/efax.rc ${PKG_SYSCONFDIR}/efax.rc
 
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
+
 post-patch:
        ${SED} -e 's:@PREFIX@:${PREFIX}:g;                              \
                s:@LOCALBASE@:${LOCALBASE}:g;                           \
diff -r 049727227b38 -r 1a84e7c64155 comms/efax/distinfo
--- a/comms/efax/distinfo       Fri Jan 29 16:04:34 2010 +0000
+++ b/comms/efax/distinfo       Fri Jan 29 16:08:17 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/04/12 23:04:21 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/01/29 16:14:29 joerg Exp $
 
 SHA1 (efax-0.9.tar.gz) = 8965407996737e6ec2c8a198ba34811f5134b5d1
 RMD160 (efax-0.9.tar.gz) = 471112ab87cfcf11521a5ea7c0cb203a44e958c3
 Size (efax-0.9.tar.gz) = 96736 bytes
-SHA1 (patch-aa) = 7ff3a7918b2f844ec230e178d006c16f9fb487ad
+SHA1 (patch-aa) = 92b663c7b9c6fce201f6a55ba3884724b60000c0
 SHA1 (patch-ab) = ea5a18f3558f28b71085a6dd2e13ddc5e17f5f26
 SHA1 (patch-ac) = afe6aaafe504f41c13a644aae4eb9c7584466db6
diff -r 049727227b38 -r 1a84e7c64155 comms/efax/patches/patch-aa
--- a/comms/efax/patches/patch-aa       Fri Jan 29 16:04:34 2010 +0000
+++ b/comms/efax/patches/patch-aa       Fri Jan 29 16:08:17 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2006/04/12 23:04:21 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/29 16:14:29 joerg Exp $
 
 --- Makefile.orig      Fri Mar 12 01:00:34 1999
 +++ Makefile
@@ -43,11 +43,11 @@
  install:
 -      cp fax efax efix $(BINDIR)
 -      cp fax.1 efax.1 efix.1 $(MANDIR)/man1
-+      $(BSD_INSTALL_PROGRAM) efax efix $(BINDIR)
-+      $(BSD_INSTALL_SCRIPT) fax $(BINDIR)
-+      $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/efax
-+      $(BSD_INSTALL_DATA) efax.rc $(PREFIX)/share/examples/efax
-+      $(BSD_INSTALL_MAN) fax.1 efax.1 efix.1 $(MANDIR)/man1
++      $(BSD_INSTALL_PROGRAM) efax efix ${DESTDIR}$(BINDIR)
++      $(BSD_INSTALL_SCRIPT) fax ${DESTDIR}$(BINDIR)
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/efax
++      $(BSD_INSTALL_DATA) efax.rc ${DESTDIR}$(PREFIX)/share/examples/efax
++      $(BSD_INSTALL_MAN) fax.1 efax.1 efix.1 ${DESTDIR}$(MANDIR)/man1
  
  clean:        
        rm -f efax efix efax.o efix.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-IPC-Cmd Updating devel/p5-IPC-Cmd from 0.50 t...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-Pod Updating devel/p5-Test-Pod from 1.40...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-IPC-Cmd Updating devel/p5-IPC-Cmd from 0.50 t...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Test-Pod Updating devel/p5-Test-Pod from 1.40...
Indexes:
Home | Main Index | Thread Index | Old Index