[pkgsrc/trunk]: pkgsrc user-destdir support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc user-destdir support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:59:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7f8ce646147
branches:  trunk
changeset: 561404:e7f8ce646147
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jul 08 17:03:51 2009 +0000

description:
user-destdir support

diffstat:

 fonts/ttf2pt1/Makefile         |   6 +++++-
 fonts/ttf2pt1/distinfo         |   4 ++--
 fonts/ttf2pt1/patches/patch-aa |  14 +++++++-------
 games/xbill/Makefile           |   8 +++++---
 games/xbill/distinfo           |   4 ++--
 games/xbill/patches/patch-aa   |  14 ++++++++------
 games/xboard/Makefile          |   4 +++-
 games/xboard/distinfo          |   4 ++--
 games/xboard/patches/patch-aa  |  29 +++++++++++++++++------------
 9 files changed, 51 insertions(+), 36 deletions(-)

diffs (238 lines):

diff -r bc3eb7ceda06 -r e7f8ce646147 fonts/ttf2pt1/Makefile
--- a/fonts/ttf2pt1/Makefile    Wed Jul 08 17:03:35 2009 +0000
+++ b/fonts/ttf2pt1/Makefile    Wed Jul 08 17:03:51 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/09/04 19:27:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 17:03:51 joerg Exp $
 #
 
 DISTNAME=      ttf2pt1-3.4.4
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://ttf2pt1.sourceforge.net/
 COMMENT=       TrueType font converter to Postscript type 1
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      t1utils-[0-9]*:../../fonts/t1utils
 
 USE_TOOLS+=    perl:run
@@ -20,6 +22,8 @@
 REPLACE_PERL+= scripts/forceiso scripts/frommap scripts/html2man
 REPLACE_PERL+= scripts/inst_dir scripts/t1fdir scripts/trans
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bc3eb7ceda06 -r e7f8ce646147 fonts/ttf2pt1/distinfo
--- a/fonts/ttf2pt1/distinfo    Wed Jul 08 17:03:35 2009 +0000
+++ b/fonts/ttf2pt1/distinfo    Wed Jul 08 17:03:51 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 19:18:29 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/07/08 17:03:51 joerg Exp $
 
 SHA1 (ttf2pt1-3.4.4.tgz) = 936771b11a740c16a8e0adb737b54b22cca18cb2
 RMD160 (ttf2pt1-3.4.4.tgz) = f88d7a26b30fa02055fd12ce1450220bd52d8df2
 Size (ttf2pt1-3.4.4.tgz) = 230547 bytes
-SHA1 (patch-aa) = e8344ed0026c94015771d08102ea4e1858061403
+SHA1 (patch-aa) = 3168178e1801a876f5161e98f796c7796d40ab94
 SHA1 (patch-ab) = 4133a4ded43eec3da256eeea31ff35b9b8167351
diff -r bc3eb7ceda06 -r e7f8ce646147 fonts/ttf2pt1/patches/patch-aa
--- a/fonts/ttf2pt1/patches/patch-aa    Wed Jul 08 17:03:35 2009 +0000
+++ b/fonts/ttf2pt1/patches/patch-aa    Wed Jul 08 17:03:51 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/08 17:03:51 joerg Exp $
 
 --- Makefile.orig      2002-08-30 18:03:07.000000000 +0000
 +++ Makefile
@@ -94,9 +94,9 @@
 -      chmod -R go-w $(SHAREDIR)
 -      scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
 -      [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
-+      $(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
-+      cp -Rf $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
-+      $(BSD_INSTALL_PROGRAM) ttf2pt1 $(BINDIR)
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(SHAREDIR)
++      cp -Rf $(TXTFILES) $(SUBDIRS) ${DESTDIR}$(SHAREDIR)
++      $(BSD_INSTALL_PROGRAM) ttf2pt1 ${DESTDIR}$(BINDIR)
        sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
                s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
                s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
@@ -104,9 +104,9 @@
 -      scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
 -      rm cvt.tmp
 -      scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
-+      $(BSD_INSTALL_SCRIPT) cvt.tmp $(BINDIR)/ttf2pt1_convert
++      $(BSD_INSTALL_SCRIPT) cvt.tmp ${DESTDIR}$(BINDIR)/ttf2pt1_convert
 +      rm -f cvt.tmp
-+      $(BSD_INSTALL_SCRIPT) scripts/x2gs $(BINDIR)/ttf2pt1_x2gs
++      $(BSD_INSTALL_SCRIPT) scripts/x2gs ${DESTDIR}$(BINDIR)/ttf2pt1_x2gs
        for i in $(MANS1); do { \
                sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
                        s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
@@ -115,7 +115,7 @@
 -              && chgrp $(GROUP) $(MANDIR)/man1/$$i \
 -              && chmod 0644 $(MANDIR)/man1/$$i \
 +                      s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$$i.tmp \
-+              && $(BSD_INSTALL_MAN) $$i.tmp $(MANDIR)/man1/$$i \
++              && $(BSD_INSTALL_MAN) $$i.tmp ${DESTDIR}$(MANDIR)/man1/$$i \
 +              && rm -f $$i.tmp \
                || exit 1; \
        } done
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xbill/Makefile
--- a/games/xbill/Makefile      Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xbill/Makefile      Wed Jul 08 17:03:51 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2009/07/08 17:07:41 joerg Exp $
 #
 
 DISTNAME=              xbill-2.0
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.xbill.org/
 COMMENT=               Stop the dreaded Windows virus from infecting computers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=            gnome-games-[0-9]*
 
 USE_LANGUAGES=         c c++
@@ -30,8 +32,8 @@
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man6 share/examples
 
 post-install:
-       ${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/${PKGMANDIR}/man6/xbill.6
-       ${INSTALL_DATA} ${WRKSRC}/scores ${PREFIX}/share/examples/xbill.scores
+       ${INSTALL_MAN} ${WRKSRC}/xbill.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xbill.6
+       ${INSTALL_DATA} ${WRKSRC}/scores ${DESTDIR}${PREFIX}/share/examples/xbill.scores
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xbill/distinfo
--- a/games/xbill/distinfo      Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xbill/distinfo      Wed Jul 08 17:03:51 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/10/23 22:57:55 rillig Exp $
+$NetBSD: distinfo,v 1.13 2009/07/08 17:07:41 joerg Exp $
 
 SHA1 (xbill-2.0.tgz) = 4ce4e37687801343af5f57c28498bd0b969c0537
 RMD160 (xbill-2.0.tgz) = 8f1551fb5f2bf7b620243ba4787c88c91d00d460
 Size (xbill-2.0.tgz) = 46909 bytes
-SHA1 (patch-aa) = 6dbb52be7523877ae52a5b6f8f913acc2e7d8a5d
+SHA1 (patch-aa) = c24632f4e81460b200485f2f644d68144a27a2e6
 SHA1 (patch-ab) = 13a90b12c94352e228406541db06bacab8cd4a0d
 SHA1 (patch-ac) = c3dd487d0002f528f6726d268673bc11be0b24b6
 SHA1 (patch-ad) = 841d5ff9bbd984b62076a96e82b04e082d09a40c
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xbill/patches/patch-aa
--- a/games/xbill/patches/patch-aa      Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xbill/patches/patch-aa      Wed Jul 08 17:03:51 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2005/10/23 22:57:55 rillig Exp $
+$NetBSD: patch-aa,v 1.10 2009/07/08 17:07:41 joerg Exp $
 
---- Imakefile.orig     1997-01-23 10:38:35.000000000 -0600
+--- Imakefile.orig     1997-01-23 17:38:35.000000000 +0100
 +++ Imakefile
 @@ -1,4 +1,4 @@
 -XBILL_DIR = /var/lib/games/xbill/
@@ -45,9 +45,11 @@
  ComplexProgramTarget($(TARGET))
  
 -InstallProgramWithFlags(scores, $(XBILL_DIR), -m 777)
+-InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
+-InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
 +install::
-+      mkdir -p $(XBILL_DIR)
-+      ${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill $(PREFIX)/bin
++      mkdir -p ${DESTDIR}$(XBILL_DIR)
++      ${INSTALL} -c -s -m ${GAMEMODE} -o ${GAMEOWN} -g ${GAMEGRP} xbill ${DESTDIR}$(PREFIX)/bin
 +
- InstallMultiple ($(XPMS), $(XBILL_DIR)pixmaps)
- InstallMultiple ($(XBMS), $(XBILL_DIR)bitmaps)
++InstallMultiple ($(XPMS),$(XBILL_DIR)pixmaps)
++InstallMultiple ($(XBMS),$(XBILL_DIR)bitmaps)
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xboard/Makefile
--- a/games/xboard/Makefile     Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xboard/Makefile     Wed Jul 08 17:03:51 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2009/07/08 17:11:23 joerg Exp $
 
 DISTNAME=      xboard-4.2.7
 PKGREVISION=   1
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.tim-mann.org/xboard.html
 COMMENT=       Graphical frontend for chess engines and servers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFIGURE_ARGS+=       --enable-xpm
 CONFIGURE_ARGS+=       --enable-zippy  # interface to ICS
 CONFIGURE_ENV+=                PERLPATH=${PERL5:Q}
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xboard/distinfo
--- a/games/xboard/distinfo     Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xboard/distinfo     Wed Jul 08 17:03:51 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/07/16 09:17:15 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/08 17:11:23 joerg Exp $
 
 SHA1 (xboard-4.2.7.tar.gz) = ad6bc0b25290079d744e93ea8c3dfcf349180180
 RMD160 (xboard-4.2.7.tar.gz) = bd05a47319a35f7024a1743bea622e26052f4d28
 Size (xboard-4.2.7.tar.gz) = 1318110 bytes
-SHA1 (patch-aa) = 6121ee25988317a546391a621933d9f783f38580
+SHA1 (patch-aa) = 16e5f93b20562c88bda618ae50534a9c3f5afa54
diff -r bc3eb7ceda06 -r e7f8ce646147 games/xboard/patches/patch-aa
--- a/games/xboard/patches/patch-aa     Wed Jul 08 17:03:35 2009 +0000
+++ b/games/xboard/patches/patch-aa     Wed Jul 08 17:03:51 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2006/07/16 09:17:15 rillig Exp $
+$NetBSD: patch-aa,v 1.9 2009/07/08 17:11:23 joerg Exp $
 
 --- Makefile.in.orig   2003-11-28 22:12:57.000000000 +0100
-+++ Makefile.in        2006-07-16 10:56:17.000000000 +0200
++++ Makefile.in
 @@ -18,10 +18,7 @@ bindir = @bindir@
  mandir = @mandir@
  man6dir = $(mandir)/man6
@@ -14,7 +14,7 @@
  
  CC = @CC@
  CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
-@@ -63,15 +60,14 @@ default: xboard zic2xpm
+@@ -63,18 +60,17 @@ default: xboard zic2xpm
  all: default pseudosource info FAQ html dvi ps
  
  install: installdirs default
@@ -24,16 +24,21 @@
 -      $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
 -      $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
 -      $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-+      $(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard
-+      $(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm
-+      $(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail
-+      $(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard
-+      $(BSD_INSTALL_MAN) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
-+      $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-       $(INSTALL_DATA) xboard.info $(infodir)/xboard.info
+-      $(INSTALL_DATA) xboard.info $(infodir)/xboard.info
 -      -PATH=$$PATH:/sbin:/usr/sbin install-info \
 -              $(infodir)/xboard.info $(infodir)/dir
-+      $(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir
++      $(BSD_INSTALL_PROGRAM) xboard ${DESTDIR}$(bindir)/xboard
++      $(BSD_INSTALL_PROGRAM) zic2xpm ${DESTDIR}$(bindir)/zic2xpm
++      $(BSD_INSTALL_SCRIPT) cmail ${DESTDIR}$(bindir)/cmail
++      $(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard ${DESTDIR}$(bindir)/pxboard
++      $(BSD_INSTALL_MAN) $(srcdir)/xboard.man ${DESTDIR}$(man6dir)/xboard$(man6ext)
++      $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man ${DESTDIR}$(man6dir)/zic2xpm$(man6ext)
++      $(INSTALL_DATA) xboard.info ${DESTDIR}$(infodir)/xboard.info
++      $(INSTALL_INFO) ${DESTDIR}$(infodir)/xboard.info ${DESTDIR}$(infodir)/dir
  
  installdirs: mkinstalldirs
-       $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
+-      $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
++      $(srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(mandir) ${DESTDIR}$(man6dir) ${DESTDIR}$(infodir)
+ 
+ uninstall:
+       rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard
Prev by Date: [pkgsrc/trunk]: pkgsrc user-destdir support
Next by Date: [pkgsrc/trunk]: pkgsrc user-destdir support
Previous by Thread: [pkgsrc/trunk]: pkgsrc user-destdir support
Next by Thread: [pkgsrc/trunk]: pkgsrc user-destdir support
Indexes:
Home | Main Index | Thread Index | Old Index