pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 user-destdir support
details: https://anonhg.NetBSD.org/pkgsrc/rev/6650316ce517
branches: trunk
changeset: 395209:6650316ce517
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jul 07 18:21:47 2009 +0000
description:
user-destdir support
diffstat:
x11/fspanel/Makefile | 7 ++++---
x11/gromit/Makefile | 10 ++++++----
x11/gtk2-theme-switch/Makefile | 8 +++++---
x11/modeline/Makefile | 6 ++++--
x11/neXtaw/Makefile | 16 +++++++++-------
x11/tk-BWidget/Makefile | 10 ++++++----
x11/tk-Tix/Makefile | 5 ++++-
7 files changed, 38 insertions(+), 24 deletions(-)
diffs (213 lines):
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/fspanel/Makefile
--- a/x11/fspanel/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/fspanel/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/07 18:25:09 joerg Exp $
#
DISTNAME= fspanel-0.8beta1
@@ -12,6 +12,7 @@
COMMENT= F***ing Small Panel for listing X11 windows
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
HAS_CONFIGURE= YES
@@ -20,8 +21,8 @@
INSTALLATION_DIRS= bin share/doc/fspanel
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fspanel/
+ ${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fspanel/
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/gromit/Makefile
--- a/x11/gromit/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/gromit/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/13 18:26:29 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/07 18:24:42 joerg Exp $
#
DISTNAME= gromit-20041213
@@ -10,15 +10,17 @@
HOMEPAGE= http://www.home.unix-ag.org/simon/gromit/
COMMENT= Text marker tool for the X11 screen
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= pkg-config
INSTALLATION_DIRS= bin
LDFLAGS+= ${X11_LDFLAGS} -lX11
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/gromit ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gromit
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit
+ ${INSTALL_PROGRAM} ${WRKSRC}/gromit ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gromit
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gromit
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/gtk2-theme-switch/Makefile
--- a/x11/gtk2-theme-switch/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/gtk2-theme-switch/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:16 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/07 18:23:55 joerg Exp $
#
DISTNAME= gtk-theme-switch-2.0.0rc2
@@ -11,6 +11,8 @@
HOMEPAGE= http://www.muhri.net/
COMMENT= Allows quick & easy switching of GTK+ 2.x themes
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake pkg-config
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
@@ -18,9 +20,9 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/switch2 \
- ${PREFIX}/bin/gtk2-theme-switch
+ ${DESTDIR}${PREFIX}/bin/gtk2-theme-switch
${INSTALL_MAN} ${WRKSRC}/switch.1 \
- ${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/modeline/Makefile
--- a/x11/modeline/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/modeline/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/07 18:22:43 joerg Exp $
DISTNAME= modeline_vfr.c
PKGNAME= modeline-20001121
@@ -10,6 +10,8 @@
HOMEPAGE= http://www.bohne-lang.de/spec/linux/modeline/
COMMENT= Calculates XF86 Modelines to configure your monitor for X11R6
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/modeline
INSTALLATION_DIRS= bin
@@ -21,6 +23,6 @@
cd ${WRKSRC}; ${CC} ${CFLAGS} ${DISTNAME} -o ${DISTNAME:S/.c//}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:S/.c//} ${DESTDIR}${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/neXtaw/Makefile
--- a/x11/neXtaw/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/neXtaw/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/04 01:25:51 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/07 18:22:37 joerg Exp $
DISTNAME= neXtaw-0.15.1
PKGREVISION= 3
@@ -9,6 +9,8 @@
HOMEPAGE= http://siag.nu/neXtaw/
COMMENT= NeXTstep-like widgets based on the Athena Widget set
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -22,17 +24,17 @@
GCC_REQD+= 2.95
.endif
+INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
+
post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/README.XAW3D ${DOCDIR}
- ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DESTDIR}${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.XAW3D ${DESTDIR}${DOCDIR}
set -e; cd ${WRKSRC}/doc/app-defaults; for file in *; do \
case "$${file}" in \
Makefile*) continue ;; \
esac; \
- ${INSTALL_DATA} "$$file" ${EGDIR}; \
+ ${INSTALL_DATA} "$$file" ${DESTDIR}${EGDIR}; \
done
.include "../../x11/libXext/buildlink3.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/tk-BWidget/Makefile
--- a/x11/tk-BWidget/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/tk-BWidget/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/05/21 09:58:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 18:21:47 joerg Exp $
DISTNAME= BWidget-1.7.0
PKGNAME= tk-${DISTNAME}
@@ -14,6 +14,7 @@
DEPENDS+= tk>=8.4:../../x11/tk
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
NO_EXTRACT= YES
NO_BUILD= YES
@@ -21,9 +22,10 @@
USE_TOOLS+= gtar
+INSTALLATION_DIRS= lib/tcl
+
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/tcl
- cd ${PREFIX}/lib/tcl && ${GTAR} zxpf ${DISTDIR}/${DISTFILES}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/tcl/${DISTNAME}
+ cd ${DESTDIR}${PREFIX}/lib/tcl && ${GTAR} zxpf ${DISTDIR}/${DISTFILES}
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/lib/tcl/${DISTNAME}
.include "../../mk/bsd.pkg.mk"
diff -r 1ffbf8b4c6b9 -r 6650316ce517 x11/tk-Tix/Makefile
--- a/x11/tk-Tix/Makefile Tue Jul 07 18:21:13 2009 +0000
+++ b/x11/tk-Tix/Makefile Tue Jul 07 18:21:47 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 18:22:02 joerg Exp $
#
DISTNAME= tix8.2.0b1
@@ -11,6 +11,8 @@
HOMEPAGE= http://tixlibrary.sourceforge.net/
COMMENT= Powerful widget library for Tcl/Tk
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/tix8.2.0/unix
@@ -20,6 +22,7 @@
--disable-stubs
MAKE_ENV+= TCL_DIR=${BUILDLINK_PREFIX.tcl}
MAKE_ENV+= TK_DIR=${BUILDLINK_PREFIX.tk}
+INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
TEST_TARGET= test
.include "../../lang/tcl/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index