summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-08-30 22:51:11 +0000
committerjlam <jlam@pkgsrc.org>2003-08-30 22:51:11 +0000
commit95af807f0ef4213ef76b8e9bbdaaa8f893d9c21f (patch)
tree407d1b0e35c4d11b94b087f1a9728177bdf14f06 /x11
parent8414314cdadd2d0ad77686ea513bedcbcb9eb82a (diff)
downloadpkgsrc-95af807f0ef4213ef76b8e9bbdaaa8f893d9c21f.tar.gz
Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if
USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically pick up a INSTALL/DEINSTALL script in the package directory and assume that you want it for the corresponding *_EXTRA_TMPL variable.
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/openmotif/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2187c58b1e7..629fda8b742 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/07/17 22:56:25 grant Exp $
+# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:38 jlam Exp $
DISTNAME= gdm-2.2.0
PKGREVISION= 4
@@ -14,7 +14,11 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_BUILDLINK2= YES
+
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 39d7fe108cd..9d3640ab6e8 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/08/08 09:25:16 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/08/30 22:51:38 jlam Exp $
# FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp
# OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp
@@ -29,8 +29,8 @@ USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
ALL_TARGET= World
-DEINSTALL_TMPL= ${.CURDIR}/DEINSTALL
-INSTALL_TMPL= ${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= X11BASE=${X11BASE}