pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 PKG_DESTDIR_SUPPORT
details: https://anonhg.NetBSD.org/pkgsrc/rev/eb1f5ca9336c
branches: trunk
changeset: 568741:eb1f5ca9336c
user: abs <abs%pkgsrc.org@localhost>
date: Thu Dec 17 18:23:14 2009 +0000
description:
PKG_DESTDIR_SUPPORT
diffstat:
x11/fvwm-wharf/Makefile | 7 ++--
x11/gtkstep/Makefile | 8 +++--
x11/keylaunch/Makefile | 10 +++---
x11/matchbox-panel/Makefile | 7 +++-
x11/swing/Makefile | 35 +++++++++++------------
x11/tk83/Makefile | 64 +++++++++++++++++++++-----------------------
x11/tk83/distinfo | 10 +++---
x11/tk83/patches/patch-aa | 33 ++++++++++++++--------
x11/tk83/patches/patch-ab | 4 +-
x11/tk83/patches/patch-ad | 10 +++---
x11/tk83/patches/patch-af | 8 ++--
11 files changed, 104 insertions(+), 92 deletions(-)
diffs (truncated from 435 to 300 lines):
diff -r f8292ef644e8 -r eb1f5ca9336c x11/fvwm-wharf/Makefile
--- a/x11/fvwm-wharf/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/fvwm-wharf/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/19 09:16:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/17 18:28:07 abs Exp $
DISTNAME= AfterStep-1.0
PKGNAME= fvwm-wharf-1.0
@@ -13,13 +13,14 @@
USE_IMAKE= YES
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+PKG_DESTDIR_SUPPORT= user-destdir
post-configure:
cd ${WRKSRC}; ${MAKE} Makefiles
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
- ${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${DESTDIR}${PREFIX}/bin/Fvwm-Wharf
+ ${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/gtkstep/Makefile
--- a/x11/gtkstep/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/gtkstep/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/07/22 09:01:54 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/12/17 18:31:46 abs Exp $
DISTNAME= gtkstep-1.10
PKGREVISION= 6
@@ -13,10 +13,12 @@
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+PKG_DESTDIR_SUPPORT= user-destdir
+
post-install:
- ${RM} -f ${PREFIX}/share/themes/Step/gtk/gtkrc.in
+ ${RM} -f ${DESTDIR}${PREFIX}/share/themes/Step/gtk/gtkrc.in
${INSTALL_DATA} ${WRKSRC}/step/Theme/gtk/gtkrc \
- ${PREFIX}/share/themes/Step/gtk
+ ${DESTDIR}${PREFIX}/share/themes/Step/gtk
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/keylaunch/Makefile
--- a/x11/keylaunch/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/keylaunch/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/08 19:49:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/12/17 18:32:51 abs Exp $
#
DISTNAME= keylaunch_1.3.3
@@ -14,13 +14,13 @@
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS+= bin share/examples/keylaunch
+PKG_DESTDIR_SUPPORT= user-destdir
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keylaunch
+ ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/docs/example_rc \
- ${PREFIX}/share/examples/keylaunch/keylaunch.rc
+ ${DESTDIR}${PREFIX}/share/examples/keylaunch/keylaunch.rc
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/matchbox-panel/Makefile
--- a/x11/matchbox-panel/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/matchbox-panel/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/10/06 18:47:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/17 18:29:05 abs Exp $
#
DISTNAME= matchbox-panel-0.9.2
@@ -21,18 +21,21 @@
CONFIGURE_ARGS+= --enable-startup-notification
CONFIGURE_ARGS+= --enable-nls
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../mk/bsd.prefs.mk"
PLIST_VARS= apm
.if ${OPSYS} == "DragonFly" || \
${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64"
# Nada
-.else
+.else
PLIST.apm= yes
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libmatchbox/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/swing/Makefile
--- a/x11/swing/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/swing/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/12/17 18:23:14 abs Exp $
DISTNAME= swing1_1_1
PKGNAME= swing-1.1.1
@@ -37,24 +37,23 @@
EGDIR= ${PREFIX}/share/examples/swing
HTMLDIR= ${PREFIX}/share/doc/swing
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+=lib/java/swing share/examples/swing share/doc/swing
+
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
- ${INSTALL_DATA_DIR} ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/swingall.jar ${PREFIX}/lib/java
- ${INSTALL_DATA} ${WRKSRC}/beaninfo.jar ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/mac.jar ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/motif.jar ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/multi.jar ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/swing.jar ${SWINGDIR}
- ${INSTALL_DATA} ${WRKSRC}/windows.jar ${SWINGDIR}
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- cd ${WRKSRC}/doc && pax -rw . ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.html ${HTMLDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.txt ${HTMLDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
- cd ${WRKSRC}/examples && pax -rw . ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/swingall.jar ${DESTDIR}${PREFIX}/lib/java
+ ${INSTALL_DATA} ${WRKSRC}/beaninfo.jar ${DESTDIR}${SWINGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/mac.jar ${DESTDIR}${SWINGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/motif.jar ${DESTDIR}${SWINGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/multi.jar ${DESTDIR}${SWINGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/swing.jar ${DESTDIR}${SWINGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/windows.jar ${DESTDIR}${SWINGDIR}
+ cd ${WRKSRC}/doc && pax -rw . ${DESTDIR}${HTMLDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DESTDIR}${HTMLDIR}
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DESTDIR}${HTMLDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.html ${DESTDIR}${HTMLDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${HTMLDIR}
+ cd ${WRKSRC}/examples && pax -rw . ${DESTDIR}${EGDIR}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/tk83/Makefile
--- a/x11/tk83/Makefile Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/tk83/Makefile Thu Dec 17 18:23:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/20 15:25:01 jwise Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/17 18:23:49 abs Exp $
DISTNAME= tk8.3.4
PKGNAME= tk-8.3.4
@@ -11,6 +11,8 @@
COMMENT= Graphical toolkit for TCL
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+INSTALLATION_DIRS+= include/tk/generic include/tk/unix
GNU_CONFIGURE= yes
CONFIGURE_DIRS= unix
@@ -37,7 +39,7 @@
# linked to a longer filename.
#
post-patch:
- @cd ${WRKSRC}/unix; \
+ cd ${WRKSRC}/unix; \
${MV} -f mkLinks mkLinks.tmp; \
${GREP} -v "^exit 0" mkLinks.tmp > mkLinks; \
${CAT} mkLinks.tmp \
@@ -57,37 +59,33 @@
done
post-install:
- ${RM} -f ${PREFIX}/bin/wish
- cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tk
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
- ${INSTALL_DATA} ${WRKSRC}/generic/default.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${PREFIX}/include/tk/generic
- ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
- ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${PREFIX}/include/tk/unix
- ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
+ cd ${DESTDIR}${PREFIX}/bin && ${LN} -s wish8.3 wish
+ ${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${DESTDIR}${PREFIX}/include/tk/generic
+ ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${DESTDIR}${PREFIX}/include/tk/unix
+ ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${DESTDIR}${PREFIX}/include/tk/unix
+ ${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${DESTDIR}${PREFIX}/include/tk/unix
.include "../../lang/tcl83/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff -r f8292ef644e8 -r eb1f5ca9336c x11/tk83/distinfo
--- a/x11/tk83/distinfo Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/tk83/distinfo Thu Dec 17 18:23:14 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2009/05/15 12:12:28 sborrill Exp $
+$NetBSD: distinfo,v 1.10 2009/12/17 18:23:49 abs Exp $
SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
Size (tk8.3.4.tar.gz) = 2589635 bytes
-SHA1 (patch-aa) = eac3c87f6fa921f046e59588e8d77dde336985c7
-SHA1 (patch-ab) = 2476494048a118c06af497428d39aaab05faec4c
+SHA1 (patch-aa) = 5859c2d4e2cafe68d5a2f14aecae4b36cab3a747
+SHA1 (patch-ab) = 6cd2c9b7a800b6a5aeb2d8f71840e78fcbd4aaa4
SHA1 (patch-ac) = b7e3a2fefafd00d3d00499117fe7dc42fb6ad429
-SHA1 (patch-ad) = 7aaab1728ad13ddbbf4483780f818996a09a67f9
+SHA1 (patch-ad) = 9afaa77065585ef6cb97864e1fbc470670773186
SHA1 (patch-ae) = 9ab780fbfcc18606423abf4a1ae8816a39856dbf
-SHA1 (patch-af) = bfbb2a9ebdaf172b242b33668d4af64c316a8b63
+SHA1 (patch-af) = 63da236ce317e9860dc0dde6097bb94ecfdbd6a8
diff -r f8292ef644e8 -r eb1f5ca9336c x11/tk83/patches/patch-aa
--- a/x11/tk83/patches/patch-aa Thu Dec 17 18:04:27 2009 +0000
+++ b/x11/tk83/patches/patch-aa Thu Dec 17 18:23:14 2009 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/11/05 03:27:56 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/17 18:23:49 abs Exp $
---- unix/Makefile.in.orig 2001-10-20 01:24:40.000000000 +0100
-+++ unix/Makefile.in 2005-05-10 17:01:34.000000000 +0100
-@@ -76,7 +76,7 @@
+--- unix/Makefile.in.orig 2001-10-20 00:24:40.000000000 +0000
++++ unix/Makefile.in
+@@ -37,7 +37,7 @@ mandir = @mandir@
+ # to be different than those used for actually reference files at
+ # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++INSTALL_ROOT = $(DESTDIR)
+
+ # Directory from which applications will reference the library of Tcl
+ # scripts (note: you can set the TK_LIBRARY environment variable at
+@@ -76,7 +76,7 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma
# The directory containing the Tcl sources and headers appropriate
# for this version of Tk ("srcdir" will be replaced or has already
# been replaced by the configure script):
@@ -11,7 +20,7 @@
# The directory containing the Tcl library archive file appropriate
# for this version of Tk:
Home |
Main Index |
Thread Index |
Old Index