Removed the ONLY_FOR_PLATFORMS line. If there are platforms that

definitely cannot run pkg_select, they should be added via
NOT_FOR_PLATFORM.

Made PKGTOOLS_PATH configurable. It is now set to the value of
PKG_TOOLS_BIN.

Moved the SUBST block further up in the package Makefile.

PKGREVISION++

3 files changed, 31 insertions, 20 deletions

diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile
index 4c62efb85cb..d7562341eed 100644
--- a/pkgtools/pkg_select/Makefile
+++ b/pkgtools/pkg_select/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:02 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/16 20:22:16 rillig Exp $
 #
 
 DISTNAME=	pkg_select-20050817
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools
 MASTER_SITES=	http://imil.net/NetBSD/
 
@@ -11,37 +11,33 @@ COMMENT=	Curses based pkgsrc system browser / manager
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* Darwin-*-* DragonFly-*-*
-
 WRKSRC=		${WRKDIR}/pkg_select
-NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-PKG_DBDIR?=	/var/db/pkg
+INSTALLATION_DIRS+=	${EXAMPLEDIR} share/pkg_select
 
 EXAMPLEDIR=	${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EXAMPLEDIR}/${PKGBASE}.conf.example	\
 			${PKG_SYSCONFDIR}/${PKGBASE}.conf
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Adjusting path.
+SUBST_FILES.path=	Makefile pkg_select.1 ${PKGBASE}.conf.example
+SUBST_SED.path=		-e "s|/usr/pkgsrc|${PKGSRCDIR}|g"
+SUBST_SED.path+=	-e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
+SUBST_SED.path+=	-e "s|/usr/pkg|${PREFIX}|g"
+SUBST_SED.path+=	-e "s|/var/db/pkg|${PKG_DBDIR}|g"
+SUBST_SED.path+=	-e "s|/usr/bin/make|${MAKE}|g"
+
+CFLAGS+=		-DPKGTOOLS_PATH=\"${PKG_TOOLS_BIN}\"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pkg_select ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/pkg_select
 	${INSTALL_DATA} ${WRKSRC}/${PKGBASE}.conf.example ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/mirrors.cvs ${PREFIX}/share/pkg_select
 	${INSTALL_DATA} ${WRKSRC}/mirrors.ftp ${PREFIX}/share/pkg_select
 	${INSTALL_MAN} ${WRKSRC}/pkg_select.1 ${PREFIX}/${PKGMANDIR}/man1
 
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	Makefile pkg_select.1 ${PKGBASE}.conf.example
-SUBST_SED.path=		-e "s|/usr/pkgsrc|${PKGSRCDIR}|g" \
-			-e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g" \
-			-e "s|/usr/pkg|${PREFIX}|g" \
-			-e "s|/var/db/pkg|${PKG_DBDIR}|g" \
-			-e "s|/usr/bin/make|${MAKE}|g"
-SUBST_MESSAGE.path=	Adjusting path.
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_select/distinfo b/pkgtools/pkg_select/distinfo
index ed2bbd95176..07567a981ae 100644
--- a/pkgtools/pkg_select/distinfo
+++ b/pkgtools/pkg_select/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/03/13 00:16:41 minskim Exp $
+$NetBSD: distinfo,v 1.5 2007/03/16 20:22:16 rillig Exp $
 
 SHA1 (pkg_select-20050817.tar.gz) = a7e22c666e4098c44cf6100a3b5e1cbcbeb48375
 RMD160 (pkg_select-20050817.tar.gz) = 0a16ea710303471730b7dbc0399a34d5e7cfff8b
 Size (pkg_select-20050817.tar.gz) = 45184 bytes
 SHA1 (patch-aa) = c59ecd6d4cfdde450aac1f2794ab7d42da8cbc07
 SHA1 (patch-ab) = a8750c8a5603fa63e0fc17c4be3db7cd340e75b7
+SHA1 (patch-ac) = 2ac66f0222d8f0f80af51eac1878d9f9e97dbbcb
diff --git a/pkgtools/pkg_select/patches/patch-ac b/pkgtools/pkg_select/patches/patch-ac
new file mode 100644
index 00000000000..09100d38720
--- /dev/null
+++ b/pkgtools/pkg_select/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2007/03/16 20:22:16 rillig Exp $
+
+--- pkg_adm.h.orig	2005-05-12 20:18:27.000000000 +0200
++++ pkg_adm.h	2007-03-16 21:02:16.000000000 +0100
+@@ -43,7 +43,9 @@ extern void set_pkg_path(const char *);
+ 
+ /* this is where you may want to port to another port framework */
+ 
++#ifndef PKGTOOLS_PATH
+ #define PKGTOOLS_PATH "/usr/sbin"
++#endif
+ #ifndef MAKE
+ #define MAKE "/usr/bin/make"
+ #endif