summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-01-28 22:03:00 +0000
committerjlam <jlam@pkgsrc.org>2003-01-28 22:03:00 +0000
commitd7f69e47ce32be7271733bcdf48d28468f400ab9 (patch)
treed3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /misc
parent63fd8d49cc206089921ed7d972b87faff07efbe6 (diff)
downloadpkgsrc-d7f69e47ce32be7271733bcdf48d28468f400ab9.tar.gz
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set to "YES". This enforces the requirement that bsd.pkg.install.mk be included at the end of a package Makefile. Idea suggested by Julio M. Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'misc')
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/libutf/Makefile8
-rw-r--r--misc/qterm/Makefile4
-rw-r--r--misc/rpm/Makefile4
-rw-r--r--misc/screen/Makefile6
5 files changed, 13 insertions, 13 deletions
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index d36ed608e95..2bd343228d6 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/20 10:03:54 skrll Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:44 jlam Exp $
DISTNAME= kdeutils-3.0.5a
COMMENT= Utilities for the KDE integrated X11 desktop
@@ -6,6 +6,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde3/Makefile.kde3"
USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
@@ -31,5 +32,4 @@ FOO_MAIN_FILES= \
.include "../../x11/kde3/buildlink2.mk"
.include "../../x11/kdebase3/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index c6084a1e540..bc21ceb1619 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/12/23 08:03:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 22:03:44 jlam Exp $
#
DISTNAME= libutf-2.10
@@ -10,8 +10,9 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://www.westley.demon.co.uk/software.html
COMMENT= UTF-8 character set support library, including regular expressions
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
ALL_TARGET= tst
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -19,5 +20,4 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/libutf
CONF_FILES= ${EGDIR}/langcoll.utf ${PKG_SYSCONFDIR}/langcoll.utf
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile
index 482612fab70..d6f2226c0d8 100644
--- a/misc/qterm/Makefile
+++ b/misc/qterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/22 22:26:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:44 jlam Exp $
#
DISTNAME= qterm-ac-1.0
@@ -11,6 +11,7 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://www.westley.demon.co.uk/software.html
COMMENT= utility to recognise terminal type automatically
+USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -18,5 +19,4 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/qterm
CONF_FILES= ${EGDIR}/qtermtab ${PKG_SYSCONFDIR}/qtermtab
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index c71928e7e4f..1968349751b 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/12/28 08:48:09 tron Exp $
+# $NetBSD: Makefile,v 1.39 2003/01/28 22:03:45 jlam Exp $
DISTNAME= rpm-2.5.4
CATEGORIES= misc
@@ -13,6 +13,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= rpm2cpio<1.0nb1
USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -35,5 +36,4 @@ pre-install:
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 2bb147d7f38..da5fb03aa9b 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/12/25 16:59:58 grant Exp $
+# $NetBSD: Makefile,v 1.41 2003/01/28 22:03:46 jlam Exp $
DISTNAME= screen-3.9.13
CATEGORIES= misc
@@ -9,7 +9,8 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.gnu.org/software/screen/screen.html
COMMENT= Multi-screen window manager
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
INFO_FILES= screen.info
PLIST_SUBST= DISTNAME=${DISTNAME}
TEXINFO_OVERRIDE= YES
@@ -38,5 +39,4 @@ post-install:
.endif
.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"