From c820203434cf763fe527cb057f59021e25a8fde6 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 29 Dec 2005 06:21:30 +0000 Subject: Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk automatically detects whether we want the pkginstall machinery to be used by the package Makefile. --- x11/aterm/Makefile | 3 +-- x11/eterm/Makefile | 3 +-- x11/gdm/Makefile | 3 +-- x11/gnome2-control-center/Makefile | 3 +-- x11/gnopernicus/Makefile | 3 +-- x11/gtk/Makefile | 3 +-- x11/gtk2/Makefile | 3 +-- x11/gtk2/modules.mk | 4 +--- x11/kdebase3/Makefile | 3 +-- x11/kdelibs3/Makefile | 3 +-- x11/kterm/Makefile | 3 +-- x11/mlterm/Makefile | 3 +-- x11/mrxvt/Makefile | 3 +-- x11/rxvt/Makefile | 3 +-- x11/wdm/Makefile | 3 +-- x11/wmweather/Makefile | 3 +-- x11/xfce4-desktop/Makefile | 3 +-- x11/xfce4-panel/Makefile | 3 +-- x11/xfce4-session/Makefile | 3 +-- x11/xfce4-utils/Makefile | 3 +-- x11/xfstt/Makefile | 3 +-- x11/xorg-clients/Makefile | 3 +-- 22 files changed, 22 insertions(+), 45 deletions(-) (limited to 'x11') diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 70474b5b2dc..5a586b32ce3 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/01 19:41:14 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:25 jlam Exp $ # DISTNAME= aterm-0.4.2 @@ -12,7 +12,6 @@ COMMENT= Aterm (Afterstep XVT) - a VT102 emulator for the X window system PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_PKGINSTALL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-background-image \ diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index f846df89b9b..2e287af6350 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:23 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/29 06:22:25 jlam Exp $ DISTNAME= Eterm-0.9.3 PKGNAME= ${DISTNAME:S/^E/e/} @@ -21,7 +21,6 @@ PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ Eterm-bg-tile.tar.gz USE_LIBTOOL= YES -USE_PKGINSTALL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 55886d712dd..22dde409e50 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.95 2005/12/29 06:22:25 jlam Exp $ # DISTNAME= gdm-2.8.0.5 @@ -21,7 +21,6 @@ SITES_Daemon.png= ${MASTER_SITE_LOCAL} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_DIRS+= gnome2-1.5 -USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 8a84570fa5c..c55215f3c79 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2005/12/29 06:22:25 jlam Exp $ # DISTNAME= control-center-2.12.1 @@ -17,7 +17,6 @@ BUILD_USES_MSGFMT= yes USE_MSGFMT_PLURALS= yes GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 -USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index 17238e9c368..ff5d5f80b82 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/29 06:22:25 jlam Exp $ # DISTNAME= gnopernicus-0.11.7 @@ -12,7 +12,6 @@ COMMENT= Collection of accessibility apps for GNOME 2 USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake pkg-config -USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index eaf4d2807bb..9c04df2f1c3 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:17 rillig Exp $ +# $NetBSD: Makefile,v 1.112 2005/12/29 06:22:25 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 8 @@ -47,7 +47,6 @@ GTK_MINOR_VERSION= ${GTK_VERSION:C/[^.]*\.//:C/\..*//} GTK_MICRO_VERSION= ${GTK_VERSION:C/.*\.//} .if ${PKG_INSTALLATION_TYPE} == "overwrite" -USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL .endif diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 74eb1d89174..070b540ec22 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2005/12/11 19:11:32 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2005/12/29 06:22:25 jlam Exp $ # DISTNAME= gtk+-2.8.9 @@ -22,7 +22,6 @@ BUILDLINK_DEPENDS.pango+= pango>=1.10.0 BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2 USE_DIRS+= xdg-1.1 -USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk index 825ab5e8c2b..61d6ed46c5a 100644 --- a/x11/gtk2/modules.mk +++ b/x11/gtk2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.10 2005/12/05 20:51:17 rillig Exp $ +# $NetBSD: modules.mk,v 1.11 2005/12/29 06:22:25 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # GTK2 modules. It takes care of rebuilding the corresponding databases at @@ -27,7 +27,6 @@ FILES_SUBST+= GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q} GTK_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gtk.immodules INSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl -USE_PKGINSTALL= YES .endif .if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss]) @@ -36,7 +35,6 @@ FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q} GDK_PIXBUF_LOADERS_DB= ${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gdk-pixbuf.loaders INSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/loaders.tmpl DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/loaders.tmpl -USE_PKGINSTALL= YES .endif PRINT_PLIST_AWK+= /^libdata\/gtk-2.0/ { next; } diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index dca0b801bae..b417836b4fe 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2005/12/17 19:36:27 markd Exp $ +# $NetBSD: Makefile,v 1.99 2005/12/29 06:22:25 jlam Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 1 @@ -17,7 +17,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} UNLIMIT_RESOURCES= datasize USE_DIRS+= xdg-1.2 -USE_PKGINSTALL= yes USE_TOOLS+= pkg-config mkfontdir CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 9131a8e7c43..5994e0e33e1 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2005/12/11 10:53:54 markd Exp $ +# $NetBSD: Makefile,v 1.97 2005/12/29 06:22:25 jlam Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -10,7 +10,6 @@ CONFLICTS+= koffice3<=1.1.1 USE_DIRS+= xdg-1.2 USE_TOOLS+= perl:run -USE_PKGINSTALL= YES MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus CONF_FILES+= ${PREFIX}/share/examples/kdelibs3/applications.menu \ diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile index 12e37780450..79c94b88e7f 100644 --- a/x11/kterm/Makefile +++ b/x11/kterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/29 06:22:25 jlam Exp $ DISTNAME= kterm-6.2.0 PKGREVISION= 8 @@ -14,7 +14,6 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= # none COMMENT= Multi-lingual terminal emulator for X -USE_PKGINSTALL= YES USE_IMAKE= YES _SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4711 diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index fb9a608424c..fd468e1689e 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/29 06:22:26 jlam Exp $ DISTNAME= mlterm-2.9.2 PKGREVISION= 1 @@ -13,7 +13,6 @@ COMMENT= Multilingual terminal emulator NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* USE_TOOLS+= pkg-config -USE_PKGINSTALL= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 31f8b81a2a1..0ce27bd3b8a 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:29 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/29 06:22:26 jlam Exp $ # DISTNAME= mrxvt-0.4.1 @@ -12,7 +12,6 @@ COMMENT= Multi-tabbed terminal emulator with Xft support PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES -USE_PKGINSTALL= YES USE_TOOLS+= gmake CONFIGURE_ARGS+= --enable-xft diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index a442000f88a..07ecae6ac5b 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/06/17 04:49:49 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/12/29 06:22:26 jlam Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 4 @@ -13,7 +13,6 @@ COMMENT= Low memory usage xterm replacement that supports color PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_PKGINSTALL= YES USE_X11BASE= YES GNU_CONFIGURE= YES diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index c20f3ee6c43..e587510a430 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/29 06:22:26 jlam Exp $ DISTNAME= wdm-1.25 PKGREVISION= 6 @@ -12,7 +12,6 @@ COMMENT= WINGs display manager BUILD_USES_MSGFMT= YES USE_DIRS+= xdg-1.1 -USE_PKGINSTALL= YES USE_X11BASE= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index e60c5be795f..5e792d889a7 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:26 jlam Exp $ # DISTNAME= wmweather-2.4.2 @@ -15,7 +15,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes USE_TOOLS+= gmake xmessage:run -USE_PKGINSTALL= yes CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-xmessage=${TOOLS_PATH.xmessage} diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 2662191c99a..c21a938b8cd 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/29 06:22:26 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -8,7 +8,6 @@ PKGNAME= xfce4-desktop-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce desktop background manager -USE_PKGINSTALL= yes PKG_SYSCONFSUBDIR= xdg/xfce4/desktop EGDIR= ${XFCE4_EGBASE}/desktop diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 3391a38985c..278f46773e8 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:26 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,7 +10,6 @@ COMMENT= Xfce panel PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in PTHREAD_AUTO_VARS= yes -USE_PKGINSTALL= yes PKG_SYSCONFSUBDIR= xdg/xfce4/panel EGDIR= ${XFCE4_EGBASE}/panel diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index 1f9e779a4d2..30073c8bb38 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:26 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -7,7 +7,6 @@ DISTNAME= xfce4-session-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce session manager -USE_PKGINSTALL= yes PKG_SYSCONFSUBDIR= xdg/xfce4-session EGDIR= ${XFCE4_EGBASE}/session diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index f747e775a32..01faa5a37fa 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:24 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/29 06:22:26 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -8,7 +8,6 @@ PKGNAME= xfce4-utils-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce utilities -USE_PKGINSTALL= yes PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 8a7b4811bc7..f6911b8641d 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/17 03:50:45 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/29 06:22:26 jlam Exp $ # DISTNAME= xfstt-1.6 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://developer.berlios.de/projects/xfstt/ COMMENT= TrueType font server for X11 -USE_PKGINSTALL= YES USE_X11BASE= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 85e86ab6230..c41b71c71cc 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/12/08 09:52:17 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:26 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -13,7 +13,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org client programs and related files -USE_PKGINSTALL= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches -- cgit v1.2.3