[pkgsrc/trunk]: pkgsrc/textproc user-destdir support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc user-destdir support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:58:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9ffd3b2d840
branches:  trunk
changeset: 561234:f9ffd3b2d840
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 21:48:22 2009 +0000

description:
user-destdir support

diffstat:

 textproc/iso12083/Makefile                |  11 ++++++-----
 textproc/ispell-francais/Makefile         |   6 +++++-
 textproc/ispell-francais/distinfo         |   4 ++--
 textproc/ispell-francais/patches/patch-aa |   6 +++---
 textproc/ispell-gaeilge/Makefile          |   6 +++++-
 textproc/ispell-gaeilge/distinfo          |   4 ++--
 textproc/ispell-gaeilge/patches/patch-aa  |  17 ++++++++++++++---
 textproc/ispell-russian-io/Makefile       |   4 +++-
 textproc/ispell-russian/Makefile          |   4 +++-
 textproc/ispell-russian/Makefile.common   |   4 +++-
 textproc/ispell-russian/distinfo          |   4 ++--
 textproc/ispell-russian/patches/patch-aa  |   6 +++---
 textproc/ispell-slovak/Makefile           |   4 +++-
 textproc/ispell-slovak/distinfo           |   4 ++--
 textproc/ispell-slovak/patches/patch-aa   |   8 ++++----
 textproc/ispell-svenska/Makefile          |   6 +++++-
 textproc/ispell-svenska/distinfo          |   4 ++--
 textproc/ispell-svenska/patches/patch-aa  |   6 +++---
 18 files changed, 70 insertions(+), 38 deletions(-)

diffs (truncated from 329 to 300 lines):

diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/iso12083/Makefile
--- a/textproc/iso12083/Makefile        Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/iso12083/Makefile        Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/04/08 22:43:25 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/07 21:54:17 joerg Exp $
 
 DISTNAME=      iso12083-1993
 PKGREVISION=   5
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://xml.coverpages.org/sgml-xml.html
 COMMENT=       SGML DTDs from the The Electronic Publishing Special Interest Group
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DIST_SUBDIR=   iso12083
 
 WRKSRC=                ${WRKDIR}
@@ -20,14 +22,13 @@
 
 SGML_CATALOGS= ${INSTDIR}/catalog
 
-pre-install:
-       ${INSTALL_DATA_DIR} ${INSTDIR}
+INSTALLATION_DIRS=     ${INSTDIR}
 
 do-install:
        @for i in ${DISTFILES}; do \
-               ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${INSTDIR}/$$i; \
+               ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${DESTDIR}${INSTDIR}/$$i; \
        done
-       @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog
+       @${INSTALL_DATA} ${FILESDIR}/catalog ${DESTDIR}${INSTDIR}/catalog
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-francais/Makefile
--- a/textproc/ispell-francais/Makefile Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-francais/Makefile Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:47 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 21:52:41 joerg Exp $
 #
 
 DISTNAME=      francais-IREQ-1.4
@@ -10,8 +10,12 @@
 HOMEPAGE=      http://www.gnu.org/software/ispell/ispell.html
 COMMENT=       French dictionary for interactive spelling checker
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      ispell-base>=3.1.20:../../textproc/ispell-base
 
+INSTALLATION_DIRS=     lib
+
 WRKSRC=                ${WRKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-francais/distinfo
--- a/textproc/ispell-francais/distinfo Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-francais/distinfo Tue Jul 07 21:48:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/07/07 21:52:41 joerg Exp $
 
 SHA1 (francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309
 RMD160 (francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d
 Size (francais-IREQ-1.4.tar.gz) = 326207 bytes
-SHA1 (patch-aa) = 628056f633bdc4b6927bc0f83793a5945807f7a8
+SHA1 (patch-aa) = 1aafea8a058e1eddb5f64e0f2788ba11e6bf81b9
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-francais/patches/patch-aa
--- a/textproc/ispell-francais/patches/patch-aa Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-francais/patches/patch-aa Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 12:14:02 agc Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 21:52:41 joerg Exp $
 
 Use the buildhash program from the base installation
 
@@ -25,8 +25,8 @@
  install: francais.hash
 -      install francais.hash $(LIBDIR)
 -      install $(AFFIXES) $(LIBDIR)
-+      ${BSD_INSTALL_DATA} francais.hash $(LIBDIR)
-+      ${BSD_INSTALL_DATA} $(AFFIXES) $(LIBDIR)
++      ${BSD_INSTALL_DATA} francais.hash ${DESTDIR}$(LIBDIR)
++      ${BSD_INSTALL_DATA} $(AFFIXES) ${DESTDIR}$(LIBDIR)
  
  # Ne pas faire ceci sans buildict!
  # francais.dico requiert buildict et d'importantes ressources informatiques
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-gaeilge/Makefile
--- a/textproc/ispell-gaeilge/Makefile  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-gaeilge/Makefile  Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 21:52:21 joerg Exp $
 
 DISTNAME=      ispell-gaeilge-2.0
 CATEGORIES=    textproc
@@ -8,6 +8,10 @@
 HOMEPAGE=      http://borel.slu.edu/~kps/ispell/
 COMMENT=       Irish language support for ispell
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      ispell-base>=3.1.20:../../textproc/ispell-base
 
+INSTALLATION_DIRS=     lib
+
 .include "../../mk/bsd.pkg.mk"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-gaeilge/distinfo
--- a/textproc/ispell-gaeilge/distinfo  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-gaeilge/distinfo  Tue Jul 07 21:48:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/07/07 21:52:21 joerg Exp $
 
 SHA1 (ispell-gaeilge-2.0.tar.gz) = 66091937e88ceff648d5cb15752ec2a25b989ea7
 RMD160 (ispell-gaeilge-2.0.tar.gz) = c9c690c617b874037cdf3c365896af68b73c1396
 Size (ispell-gaeilge-2.0.tar.gz) = 267946 bytes
-SHA1 (patch-aa) = f518c1f597e2f308a0fc9559abfe3eee77ff2fce
+SHA1 (patch-aa) = 10a4043274b534610701873d867a9b2320c34075
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-gaeilge/patches/patch-aa
--- a/textproc/ispell-gaeilge/patches/patch-aa  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-gaeilge/patches/patch-aa  Tue Jul 07 21:48:22 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2002/08/01 23:10:07 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 21:52:21 joerg Exp $
 
---- Makefile.orig      Wed Jul 31 12:37:34 2002
-+++ Makefile   Thu Aug  1 18:54:45 2002
+--- Makefile.orig      2002-07-31 18:37:34.000000000 +0200
++++ Makefile
 @@ -1,13 +1,13 @@
  # Makefile ispell-gaeilge
  # INSTALLATION=gaeilgemor
@@ -19,3 +19,14 @@
  
  #   Shouldn't have to change anything below here
  SHELL=/bin/sh
+@@ -172,8 +172,8 @@ sounds.txt: FORCE
+       $(ASPELL) --lang=gaeilge soundslike < aspell.txt > sounds.txt
+ 
+ install: $(INSTALLATION).hash
+-      $(INSTALL_DATA) $(INSTALLATION).hash $(ISPELLDIR)
+-      $(INSTALL_DATA) $(INSTALLATION).aff $(ISPELLDIR)
++      $(INSTALL_DATA) $(INSTALLATION).hash ${DESTDIR}$(ISPELLDIR)
++      $(INSTALL_DATA) $(INSTALLATION).aff ${DESTDIR}$(ISPELLDIR)
+ 
+ installall: gaeilge.hash gaeilgemor.hash
+       $(INSTALL_DATA) gaeilge.hash $(ISPELLDIR)
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-russian-io/Makefile
--- a/textproc/ispell-russian-io/Makefile       Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-russian-io/Makefile       Tue Jul 07 21:48:22 2009 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/08/22 15:46:49 mishka Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/07 21:50:17 joerg Exp $
 
 PKGNAME=       ispell-russian-io-${RUS_ISPELL_VERSION}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_ENV+=     IO="defined"
 
 .include "../../textproc/ispell-russian/Makefile.common"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-russian/Makefile
--- a/textproc/ispell-russian/Makefile  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-russian/Makefile  Tue Jul 07 21:48:22 2009 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/08/22 15:46:49 mishka Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 21:50:16 joerg Exp $
 
 PKGNAME=       ispell-russian-${RUS_ISPELL_VERSION}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../textproc/ispell-russian/Makefile.common"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-russian/Makefile.common
--- a/textproc/ispell-russian/Makefile.common   Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-russian/Makefile.common   Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/07/15 15:36:15 mishka Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/07/07 21:50:16 joerg Exp $
 
 RUS_ISPELL_VERSION=    0.99g4
 
@@ -18,4 +18,6 @@
 WRKSRC=                ${WRKDIR}
 MAKE_ENV+=     CAT=${CAT:Q} RM=${RM:Q} SED=${SED:Q} TR=${TR:Q} UNIQ="uniq"
 
+INSTALLATION_DIRS=     lib
+
 .include "../../mk/bsd.pkg.mk"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-russian/distinfo
--- a/textproc/ispell-russian/distinfo  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-russian/distinfo  Tue Jul 07 21:48:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/08/22 15:24:31 mishka Exp $
+$NetBSD: distinfo,v 1.6 2009/07/07 21:50:16 joerg Exp $
 
 SHA1 (rus-ispell-0.99g4.tar.gz) = a1f178b8e51abe812a69209f58e4f583e4e7bc39
 RMD160 (rus-ispell-0.99g4.tar.gz) = 6c2d74b22c488e6372615b98c727f84011dea1be
 Size (rus-ispell-0.99g4.tar.gz) = 521972 bytes
-SHA1 (patch-aa) = 6152418a092707c768ffa0112ae01c42f246415c
+SHA1 (patch-aa) = 79cf6e28c3076a324e0f5b9b1228192bc470be6e
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-russian/patches/patch-aa
--- a/textproc/ispell-russian/patches/patch-aa  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-russian/patches/patch-aa  Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/01/23 15:02:07 agc Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 21:50:17 joerg Exp $
 
 --- Makefile.orig      2002-10-09 23:35:54.000000000 +0100
 +++ Makefile   2004-01-23 14:49:03.000000000 +0000
@@ -47,8 +47,8 @@
  
  install:
 -      cp russian.hash russian.aff $(LIB)
-+      ${BSD_INSTALL_DATA} russian${DICTNAME}.hash ${INSTALLDIR}
-+      ${BSD_INSTALL_DATA} russian${DICTNAME}.aff ${INSTALLDIR}
++      ${BSD_INSTALL_DATA} russian${DICTNAME}.hash ${DESTDIR}${INSTALLDIR}
++      ${BSD_INSTALL_DATA} russian${DICTNAME}.aff ${DESTDIR}${INSTALLDIR}
 +
 +russian${DICTNAME}.hash:      russian${DICTNAME}.aff russian${DICTNAME}.dict
 +      ${BUILDHASH} russian${DICTNAME}.dict russian${DICTNAME}.aff $@
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-slovak/Makefile
--- a/textproc/ispell-slovak/Makefile   Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-slovak/Makefile   Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:25 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 21:48:22 joerg Exp $
 #
 
 DISTNAME=      ispell-sk-0.2.2
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://sk-spell.sk.cx/?id=4
 COMMENT=       Slovak dictionary for ispell
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      ispell-base>=3.1.20:../../textproc/ispell-base
 
 MAKE_ENV+=     CAT=${CAT:Q} SORT=${SORT:Q}
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-slovak/distinfo
--- a/textproc/ispell-slovak/distinfo   Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-slovak/distinfo   Tue Jul 07 21:48:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.10 2009/07/07 21:48:22 joerg Exp $
 
 SHA1 (ispell-sk-0.2.2.tar.gz) = e30fe88dd7cc0d0b318e20870649bc24245624f3
 RMD160 (ispell-sk-0.2.2.tar.gz) = 55ba2884e5f4b644672fee23635d8b5fd48c3b96
 Size (ispell-sk-0.2.2.tar.gz) = 611006 bytes
-SHA1 (patch-aa) = 73553e3d1ad289ac19ea31800ada7219de69a36a
+SHA1 (patch-aa) = cfc3c03c69d5bd50d8f92907100fcb4c9e97684b
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-slovak/patches/patch-aa
--- a/textproc/ispell-slovak/patches/patch-aa   Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-slovak/patches/patch-aa   Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/09/12 20:57:41 salo Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/07 21:48:22 joerg Exp $
 
 --- Makefile.orig      2004-02-27 14:50:43.000000000 +0100
 +++ Makefile   2004-09-12 22:50:13.000000000 +0200
@@ -13,9 +13,9 @@
 -      mkdir -p $(DESTDIR)
 -      install -o root -g bin -m 0444 slovak.hash $(DESTDIR)
 -      install -o root -g bin -m 0444 slovak.aff $(DESTDIR)
-+      ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR)
-+      ${BSD_INSTALL_DATA} slovak.hash $(INSTALLDIR)
-+      ${BSD_INSTALL_DATA} slovak.aff $(INSTALLDIR)
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR)
++      ${BSD_INSTALL_DATA} slovak.hash ${DESTDIR}$(INSTALLDIR)
++      ${BSD_INSTALL_DATA} slovak.aff ${DESTDIR}$(INSTALLDIR)
  
  slovak.words:
 -      cat *.words | sort -u -f > slovak.words
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-svenska/Makefile
--- a/textproc/ispell-svenska/Makefile  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-svenska/Makefile  Tue Jul 07 21:48:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:30:47 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/07 21:48:25 joerg Exp $
 #
 
 DISTNAME=      iswedish-1.2.1
@@ -10,6 +10,10 @@
 HOMEPAGE=      http://www.gnu.org/software/ispell/ispell.html
 COMMENT=       Swedish dictionary for interactive spelling checker
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+INSTALLATION_DIRS=     lib
+
 DEPENDS+=      ispell-base>=3.1.20:../../textproc/ispell-base
 
 .include "../../mk/bsd.pkg.mk"
diff -r ce0a3293bfcd -r f9ffd3b2d840 textproc/ispell-svenska/distinfo
--- a/textproc/ispell-svenska/distinfo  Tue Jul 07 21:46:36 2009 +0000
+++ b/textproc/ispell-svenska/distinfo  Tue Jul 07 21:48:22 2009 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated www/p5-Catalyst-Plugin-Authentication to 0...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated www/p5-Catalyst-Action-RenderView to 0.11
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated www/p5-Catalyst-Plugin-Authentication to 0...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated www/p5-Catalyst-Action-RenderView to 0.11
Indexes:
Home | Main Index | Thread Index | Old Index