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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11 user-destdir support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:26:50 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c566e44ac40f
branches:  trunk
changeset: 395171:c566e44ac40f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 17:22:27 2009 +0000

description:
user-destdir support

diffstat:

 x11/xless/Makefile               |   6 +++++-
 x11/xless/distinfo               |   4 ++--
 x11/xless/patches/patch-aa       |  15 ++++++++++++---
 x11/xscreensaver-demo/Makefile   |  11 ++++++++---
 x11/xscreensaver/Makefile        |  12 +++++++-----
 x11/xscreensaver/Makefile.common |   4 +++-
 x11/xscreensaver/options.mk      |   8 ++++----
 7 files changed, 41 insertions(+), 19 deletions(-)

diffs (165 lines):

diff -r bfa096356a70 -r c566e44ac40f x11/xless/Makefile
--- a/x11/xless/Makefile        Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xless/Makefile        Tue Jul 07 17:22:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/07 17:22:27 joerg Exp $
 
 DISTNAME=      xless-1.7
 PKGREVISION=   3
@@ -9,10 +9,14 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       X11 text viewer; useful as an add-on tool for other apps
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_JOBS_SAFE=                no
 
 USE_IMAKE=     yes
 
+INSTALLATION_DIRS=     lib/X11
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff -r bfa096356a70 -r c566e44ac40f x11/xless/distinfo
--- a/x11/xless/distinfo        Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xless/distinfo        Tue Jul 07 17:22:27 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/07/07 17:22:27 joerg Exp $
 
 SHA1 (xless-1.7.tar.gz) = 2fb2c468aa6c0237be1d2bc256fcaf754c98b20e
 RMD160 (xless-1.7.tar.gz) = 87047418d9928df97635b1f2b2908559fe5d2461
 Size (xless-1.7.tar.gz) = 45559 bytes
-SHA1 (patch-aa) = 40886d34888ab70deba4cec08a1f9f596c3a6a88
+SHA1 (patch-aa) = d76edac759341d472a44eae25b08f8f89271fc5d
diff -r bfa096356a70 -r c566e44ac40f x11/xless/patches/patch-aa
--- a/x11/xless/patches/patch-aa        Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xless/patches/patch-aa        Tue Jul 07 17:22:27 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:24 agc Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 17:22:27 joerg Exp $
 
---- Imakefile.orig     Thu Jun  2 16:22:14 1994
-+++ Imakefile  Fri Dec 27 18:52:23 1996
+--- Imakefile.orig     1994-06-03 01:22:14.000000000 +0200
++++ Imakefile
 @@ -5,7 +5,8 @@
   *    -DPRINTCMD=\"/usr/ucb/lpr\"     - path to send file to printer
   *    -DTILDE_EXPANSION               - perform ~ expansion on filenames
@@ -12,3 +12,12 @@
  
  
             SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
+@@ -27,7 +28,7 @@ LOCAL_LIBRARIES = -Lregexp -lregexp XawC
+ MakeSubdirs($(SUBDIRS))
+ ComplexProgramTarget(xless)
+ 
+-InstallNonExec(xless.help, $(LIBDIR))
++InstallNonExec(xless.help,$(LIBDIR))
+ InstallAppDefaults(XLess)
+ 
+ #if ProjectX >= 5
diff -r bfa096356a70 -r c566e44ac40f x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile    Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xscreensaver-demo/Makefile    Tue Jul 07 17:22:27 2009 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2008/03/10 12:37:12 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/07 17:28:04 joerg Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-demo-/}
 COMMENT=       Demo viewer and configuration tool for xscreensaver
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-gnome-[0-9]*
 
 USE_DIRS+=     xdg-1.1
@@ -20,10 +22,13 @@
 INSTALL_DIRS=          ${WRKSRC}/driver
 INSTALL_TARGET=                install-gnome
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo \
+           ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
-                      ${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
+           ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r bfa096356a70 -r c566e44ac40f x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xscreensaver/Makefile Tue Jul 07 17:22:27 2009 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.84 2008/03/10 12:37:12 drochner Exp $
+# $NetBSD: Makefile,v 1.85 2009/07/07 17:28:04 joerg Exp $
 
 COMMENT=       Screen saver and locker for the X window system
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=       --without-gtk
@@ -20,11 +22,11 @@
 post-extract:
        cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
 
-post-install: installpamex
-installpamex:
-       ${INSTALL_DATA_DIR} ${EGDIR}/pam.d
+INSTALLATION_DIRS=     ${EGDIR}/pam.d
+
+post-install:
        ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
-                ${EGDIR}/pam.d/xscreensaver-NetBSD
+           ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
 
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff -r bfa096356a70 -r c566e44ac40f x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xscreensaver/Makefile.common  Tue Jul 07 17:22:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.98 2009/01/14 13:29:15 drochner Exp $
+# $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $
 #
 
 # When updating the package,
@@ -63,6 +63,8 @@
 GCC_REQD+=             2.95.3
 .endif
 
+INSTALL_MAKE_FLAGS=    install_prefix=${DESTDIR}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff -r bfa096356a70 -r c566e44ac40f x11/xscreensaver/options.mk
--- a/x11/xscreensaver/options.mk       Tue Jul 07 17:19:37 2009 +0000
+++ b/x11/xscreensaver/options.mk       Tue Jul 07 17:22:27 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/01/08 21:45:10 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2009/07/07 17:28:04 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
 PKG_SUPPORTED_OPTIONS= pam xscreensaver-webcollage
@@ -24,7 +24,7 @@
 .else
 post-install: delwebcollage
 delwebcollage:
-       rm ${PREFIX}/libexec/xscreensaver/config/webcollage.xml
-       rm ${PREFIX}/libexec/xscreensaver/webcollage
-       rm ${PREFIX}/${PKGMANDIR}/man6/webcollage.6
+       rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/config/webcollage.xml
+       rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/webcollage
+       rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/webcollage.6
 .endif

Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/p5-DBIx-Class-Cursor-Cached Importing packag...
Next by Date: [pkgsrc/trunk]: pkgsrc Added databases/p5-DBIx-Class-Cursor-Cached version 1.0.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/p5-DBIx-Class-Cursor-Cached Importing packag...
Next by Thread: [pkgsrc/trunk]: pkgsrc Added databases/p5-DBIx-Class-Cursor-Cached version 1.0.1
Indexes:

Home | Main Index | Thread Index | Old Index