[pkgsrc/trunk]: pkgsrc PKG_DESTDIR_SUPPORT

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc PKG_DESTDIR_SUPPORT
From: abs <abs%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 08:45:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d44bcc0a60f
branches:  trunk
changeset: 568762:5d44bcc0a60f
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 17 21:56:22 2009 +0000

description:
PKG_DESTDIR_SUPPORT

diffstat:

 comms/scmxx/Makefile                  |  19 ++++++-----
 converters/latex2rtf/Makefile         |   7 ++-
 converters/latex2rtf/distinfo         |   4 +-
 converters/latex2rtf/patches/patch-aa |  56 +++++++++++++++++++++-------------
 4 files changed, 51 insertions(+), 35 deletions(-)

diffs (157 lines):

diff -r 1ffed83e7a59 -r 5d44bcc0a60f comms/scmxx/Makefile
--- a/comms/scmxx/Makefile      Thu Dec 17 21:50:07 2009 +0000
+++ b/comms/scmxx/Makefile      Thu Dec 17 21:56:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/07/13 10:16:30 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2009/12/17 21:58:33 abs Exp $
 #
 
 DISTNAME=              scmxx-0.9.0
@@ -14,21 +14,22 @@
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake msgfmt
 
+INSTALLATION_DIRS+= share/doc/scmxx share/examples/scmxx
+PKG_DESTDIR_SUPPORT= user-destdir
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx
        ${INSTALL_DATA} ${WRKSRC}/docs/doc_sources.txt                  \
-           ${PREFIX}/share/doc/scmxx
+           ${DESTDIR}${PREFIX}/share/doc/scmxx
        ${INSTALL_DATA} ${WRKSRC}/docs/gsmcharset.txt                   \
-           ${PREFIX}/share/doc/scmxx
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmxx
+           ${DESTDIR}${PREFIX}/share/doc/scmxx
        ${INSTALL_DATA} ${WRKSRC}/examples/debian_with_scmxx.bmp        \
-           ${PREFIX}/share/examples/scmxx
+           ${DESTDIR}${PREFIX}/share/examples/scmxx
        ${INSTALL_DATA} ${WRKSRC}/examples/sms.txt                      \
-           ${PREFIX}/share/examples/scmxx
+           ${DESTDIR}${PREFIX}/share/examples/scmxx
        ${INSTALL_DATA} ${WRKSRC}/examples/vCalendar.vcs                \
-           ${PREFIX}/share/examples/scmxx
+           ${DESTDIR}${PREFIX}/share/examples/scmxx
        ${INSTALL_DATA} ${WRKSRC}/examples/vCard.vcf                    \
-           ${PREFIX}/share/examples/scmxx
+           ${DESTDIR}${PREFIX}/share/examples/scmxx
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 1ffed83e7a59 -r 5d44bcc0a60f converters/latex2rtf/Makefile
--- a/converters/latex2rtf/Makefile     Thu Dec 17 21:50:07 2009 +0000
+++ b/converters/latex2rtf/Makefile     Thu Dec 17 21:56:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/20 18:15:37 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/12/17 21:56:22 abs Exp $
 #
 
 DISTNAME=      latex2rtf-1.9.16a
@@ -12,14 +12,15 @@
 
 USE_TOOLS+=    perl
 MAKE_FLAGS+=   XCFLAGS=${CFLAGS:M*:Q}
-INFO_FILES=    # PLIST
+INFO_FILES=    YES # PLIST
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 INSTALLATION_DIRS=     share/doc/latex2rtf ${PKGINFODIR}
 
 post-install:
        cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do             \
                ${TEST} ! -f "$$f" ||                                   \
-               ${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};           \
+               ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};         \
        done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1ffed83e7a59 -r 5d44bcc0a60f converters/latex2rtf/distinfo
--- a/converters/latex2rtf/distinfo     Thu Dec 17 21:50:07 2009 +0000
+++ b/converters/latex2rtf/distinfo     Thu Dec 17 21:56:22 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/03/03 19:52:37 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2009/12/17 21:56:22 abs Exp $
 
 SHA1 (latex2rtf-1.9.16a.tar.gz) = e4f522d600b0386fa544f0fe59a7024325d0b567
 RMD160 (latex2rtf-1.9.16a.tar.gz) = 0bea62eafdbd6c240d76e3d7d6bac5cf7a14f8fe
 Size (latex2rtf-1.9.16a.tar.gz) = 633884 bytes
-SHA1 (patch-aa) = 557b35faf91536105b5093dd7f1e62e50db7b0d6
+SHA1 (patch-aa) = 5a8d2471631abc33e3e9668f96128f8b4fb02483
diff -r 1ffed83e7a59 -r 5d44bcc0a60f converters/latex2rtf/patches/patch-aa
--- a/converters/latex2rtf/patches/patch-aa     Thu Dec 17 21:50:07 2009 +0000
+++ b/converters/latex2rtf/patches/patch-aa     Thu Dec 17 21:56:22 2009 +0000
@@ -1,39 +1,53 @@
-$NetBSD: patch-aa,v 1.5 2006/03/03 19:52:37 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/17 21:56:22 abs Exp $
 
---- Makefile.orig      2004-11-07 18:59:18.000000000 -0800
-+++ Makefile   2005-11-03 15:42:07.000000000 -0800
+--- Makefile.orig      2004-11-08 02:59:18.000000000 +0000
++++ Makefile
 @@ -2,3 +2,3 @@
  
 -CC=gcc
 +CC?=gcc
  MKDIR=mkdir -p
-@@ -18,14 +18,14 @@
- #CFLAGS:=$(CFLAGS) -Zwin32  
- 
+@@ -20,3 +20,3 @@ CFLAGS:=-DUNIX
  #Base directory - adapt as needed
 -PREFIX=$(PREFIX_DRIVE)/usr/local
 +PREFIX?=$(PREFIX_DRIVE)/usr/local
  
- #Name of executable binary --- beware of 8.3 restriction under DOS
- BINARY_NAME=latex2rtf$(EXE_SUFFIX)
- 
- # Location of binary, man, info, and support files - adapt as needed
+@@ -27,3 +27,3 @@ BINARY_NAME=latex2rtf$(EXE_SUFFIX)
  BIN_INSTALL=$(PREFIX)/bin
 -MAN_INSTALL=$(PREFIX)/man/man1
 +MAN_INSTALL=$(PREFIX)/$(PKGMANDIR)/man1
  INFO_INSTALL=$(PREFIX)/info
- SUPPORT_INSTALL=$(PREFIX)/share/latex2rtf
- CFG_INSTALL=$(PREFIX)/share/latex2rtf/cfg
-@@ -176,9 +176,9 @@
-       cp doc/latex2rtf.1    $(MAN_INSTALL)
-       cp doc/latex2png.1    $(MAN_INSTALL)
-       cp $(CFGS)            $(CFG_INSTALL)
+@@ -170,13 +170,13 @@ doc: doc/latex2rtf.texi doc/Makefile
+ install: latex2rtf doc/latex2rtf.1 $(CFGS) scripts/latex2png
+-      $(MKDIR) $(BIN_INSTALL)
+-      $(MKDIR) $(MAN_INSTALL)
+-      $(MKDIR) $(CFG_INSTALL)
+-      cp $(BINARY_NAME)     $(BIN_INSTALL)
+-      cp scripts/latex2png  $(BIN_INSTALL)
+-      cp doc/latex2rtf.1    $(MAN_INSTALL)
+-      cp doc/latex2png.1    $(MAN_INSTALL)
+-      cp $(CFGS)            $(CFG_INSTALL)
 -      cp doc/latex2rtf.html $(SUPPORT_INSTALL)
 -      cp doc/latex2rtf.pdf  $(SUPPORT_INSTALL)
 -      cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
-+      cp doc/latex2rtf.html $(PREFIX)/share/doc/latex2rtf
-+      cp doc/latex2rtf.pdf  $(PREFIX)/share/doc/latex2rtf
-+#     cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
++      $(MKDIR) $(DESTDIR)$(BIN_INSTALL)
++      $(MKDIR) $(DESTDIR)$(MAN_INSTALL)
++      $(MKDIR) $(DESTDIR)$(CFG_INSTALL)
++      cp $(BINARY_NAME)     $(DESTDIR)$(BIN_INSTALL)
++      cp scripts/latex2png  $(DESTDIR)$(BIN_INSTALL)
++      cp doc/latex2rtf.1    $(DESTDIR)$(MAN_INSTALL)
++      cp doc/latex2png.1    $(DESTDIR)$(MAN_INSTALL)
++      cp $(CFGS)            $(DESTDIR)$(CFG_INSTALL)
++      cp doc/latex2rtf.html $(DESTDIR)$(PREFIX)/share/doc/latex2rtf
++      cp doc/latex2rtf.pdf  $(DESTDIR)$(PREFIX)/share/doc/latex2rtf
++#     cp doc/latex2rtf.txt  $(DESTDIR)$(SUPPORT_INSTALL)
        @echo "******************************************************************"
-       @echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\""
-       @echo "*** in directory \"$(BIN_INSTALL)\""
+@@ -197,5 +197,5 @@ install: latex2rtf doc/latex2rtf.1 $(CFG
+ install-info: doc/latex2rtf.info
+-      $(MKDIR) $(INFO_INSTALL)
+-      cp doc/latex2rtf.info $(INFO_INSTALL)
+-      install-info --info-dir=$(INFO_INSTALL) doc/latex2rtf.info
++      $(MKDIR) $(DESTDIR)$(INFO_INSTALL)
++      cp doc/latex2rtf.info $(DESTDIR)$(INFO_INSTALL)
++      install-info --info-dir=$(DESTDIR)$(INFO_INSTALL) doc/latex2rtf.info
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/editors/nvi-m17n Add DESTDIR to install target - not s...
Next by Date: [pkgsrc/trunk]: pkgsrc/security/libprelude Remove removal of the hack which w...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/editors/nvi-m17n Add DESTDIR to install target - not s...
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/libprelude Remove removal of the hack which w...
Indexes:
Home | Main Index | Thread Index | Old Index