summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/Xaw3d/Makefile11
-rw-r--r--x11/Xrandr-mixedcase/Makefile3
-rw-r--r--x11/Xrender/Makefile3
-rw-r--r--x11/gtk2/Makefile14
-rw-r--r--x11/xorg-clients/Makefile4
-rw-r--r--x11/xorg-imake/Makefile17
-rw-r--r--x11/xorg-libs/Makefile12
-rw-r--r--x11/xorg-server/Makefile8
-rw-r--r--x11/xterm/Makefile4
9 files changed, 44 insertions, 32 deletions
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 103344a697a..26192e98962 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/03/13 00:16:23 markd Exp $
+# $NetBSD: Makefile,v 1.49 2006/10/09 12:52:36 joerg Exp $
#
DISTNAME= Xaw3d-1.5E
@@ -13,6 +13,7 @@ COMMENT= 3-D widgets based on the Athena Widget set
CONFLICTS= Xaw-Xpm-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
USE_IMAKE= YES
@@ -32,14 +33,14 @@ XMKMF_FLAGS+= ${IMAKE_FLAGS}
PLIST_SUBST+= INCDIR=include/X11
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
- ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/Xaw3d
+ ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DESTDIR}${PREFIX}/share/doc/Xaw3d
${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
.if ${OPSYS} == "IRIX"
- ${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${PREFIX}/lib/
+ ${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${DESTDIR}${PREFIX}/lib/
${RM} -f /usr/lib${ABI}/libXaw3d*
.endif
- cd ${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
+ cd ${DESTDIR}${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index f7e93e8e3b8..ef0bee5de73 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/07/31 21:26:12 reed Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:36 joerg Exp $
#
DISTNAME= libXrandr-1.0.2
@@ -15,6 +15,7 @@ COMMENT= X RandR extension (Library)
CONFLICTS+= libXrandr-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index a613fda8f1b..f6709a1674e 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/07/31 21:27:46 reed Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $
DISTNAME= libXrender-0.9.0
PKGNAME= ${DISTNAME:S/lib//}
@@ -14,6 +14,7 @@ COMMENT= Client library for the X Rendering Extension protocol
CONFLICTS+= libXrender-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 4e77acc83f0..d3ff46b47f7 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2006/10/06 18:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2006/10/09 12:52:36 joerg Exp $
DISTNAME= gtk+-2.10.6
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -12,6 +12,8 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gtk.org/
COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
+PKG_DESTDIR_SUPPORT= user-destdir
+
CONFLICTS= gtk2-engines<2.6.0
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0
@@ -73,11 +75,11 @@ USE_TOOLS+= gawk
# anew in the +INSTALL script as part of the POST-INSTALL action.
#
post-install:
- ${RM} -f ${GTK_IMMODULES_DB}
- ${RM} -f ${GDK_PIXBUF_LOADERS_DB}
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/immodules
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.10.0/filesystems
+ ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
+ ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/immodules
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/modules
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/gtk-2.0/2.10.0/filesystems
_BUILDING_GTK2= yes
.include "modules.mk"
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 3f39c6a12f4..983a107e914 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/09/14 17:13:58 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
@@ -13,6 +13,8 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org client programs and related files
+PKG_DESTDIR_SUPPORT= user-destdir
+
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 5c135fc000c..62cfc420074 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/09/25 12:49:58 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.x.org/
COMMENT= Imake and other utilities from X.org
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_DIRS+= xorg-1.1
INSTALL_TARGET= install install.man
@@ -79,20 +80,20 @@ pre-install:
${WRKSRC}/xmakefile
post-install:
- ${CHMOD} ${NONBINMODE} ${X11ROOT}/lib/X11/config/host.def
- @${CP} ${X11ROOT}/lib/X11/config/host.def \
- ${X11ROOT}/lib/X11/config/host.def.orig
+ ${CHMOD} ${NONBINMODE} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def
+ @${CP} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def \
+ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig
@${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" \
- ${X11ROOT}/lib/X11/config/host.def.orig > \
- ${X11ROOT}/lib/X11/config/host.def
- @${RM} ${X11ROOT}/lib/X11/config/host.def.orig
+ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig > \
+ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def
+ @${RM} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig
@( \
${ECHO}; \
${ECHO} "#ifdef BeforeVendorCF"; \
${ECHO} "#define ProjectRoot ${X11ROOT}"; \
${ECHO} "#endif"; \
- ) >> ${X11ROOT}/lib/X11/config/host.def
+ ) >> ${DESTDIR}${X11ROOT}/lib/X11/config/host.def
.if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*) || \
!empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 7fed7fb26a1..31977d49a7a 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/09/14 17:13:58 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.x.org/
COMMENT= X.org Libraries
BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
@@ -35,6 +36,8 @@ CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
.endif
+INSTALLATION_DIRS+= ${X11BASE}/lib/pkgconfig
+
BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib
XBUILD_DIRS= lib nls programs/Xserver/include \
@@ -51,19 +54,16 @@ SUBST_MESSAGE.mkstrs= Fixing path of makestrs.
post-install:
@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
-.if ${OPSYS} == "Linux"
- @${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
-.endif
pre-install:
.if !exists(${X11BASE}/lib/pkgconfig)
- ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig
+ ${INSTALL_DATA_DIR} ${DESTDIR}${X11BASE}/lib/pkgconfig
.endif
.for f in render.pc fixesext.pc compositeext.pc
@${SED} -e "s,@X11BASE@,${X11BASE},g" \
-e "s,@LOCALBASE@,${LOCALBASE},g" \
${FILESDIR}/${f} > ${WRKSRC}/${f}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${X11BASE}/lib/pkgconfig/${f}
.endfor
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 28db7e6600a..ce61dc11957 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/09/14 17:13:58 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/10/09 12:52:36 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@@ -13,6 +13,8 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org X server and related programs
+PKG_DESTDIR_SUPPORT= user-destdir
+
BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
@@ -75,9 +77,9 @@ PLIST_SUBST+= IOPORT='@comment '
post-install:
@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
.if ${OPSYS} == "Darwin"
- ${CHMOD} a+r ${X11ROOT}/bin/XDarwin
+ ${CHMOD} a+r ${DESTDIR}${X11ROOT}/bin/XDarwin
.else
- ${CHMOD} a+r ${X11ROOT}/bin/Xorg
+ ${CHMOD} a+r ${DESTDIR}${X11ROOT}/bin/Xorg
.endif
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 2c8a9290d17..5c5b55e7223 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/06/25 19:37:44 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/10/09 12:52:36 joerg Exp $
DISTNAME= xterm-212
CATEGORIES= x11
@@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://dickey.his.com/xterm/xterm.html
COMMENT= Latest terminal emulator for the X Window System
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-07 05:43:05 +0000