Subject: xpkgwedge and custom PKGMANDIR
To: None <tech-pkg@NetBSD.org, jlam@pkgsrc.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 01/18/2006 17:09:05
I am testing the following with custom PKGMANDIR and also with default.

If okay, I will commit in a couple days.

Any comments on the following?

Index: pkgtools/xpkgwedge/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/xpkgwedge/Makefile,v
retrieving revision 1.64
diff -b -u -r1.64 Makefile
--- pkgtools/xpkgwedge/Makefile	12 Jan 2006 19:02:34 -0000	1.64
+++ pkgtools/xpkgwedge/Makefile	19 Jan 2006 00:56:09 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.64 2006/01/12 19:02:34 joerg Exp $
 
-DISTNAME=	xpkgwedge-1.15
+DISTNAME=	xpkgwedge-1.16
 CATEGORIES=	pkgtools devel x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -54,6 +54,12 @@
 SUBST_SED.paths+=	-e 's,@MAKE@,${MAKE},g'
 SUBST_STAGE.paths=	post-patch
 
+SUBST_CLASSES+=		man
+SUBST_STAGE.man=	post-patch
+SUBST_FILES.man=	xpkgwedge.def
+SUBST_SED.man=		-e "s|@PKGMANDIR@|${PKGMANDIR}|"
+
+
 post-extract:
 	@${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC}
 	@${CP} ${FILESDIR}/pkgxmkmf.in ${WRKDIR}/pkgxmkmf
Index: pkgtools/xpkgwedge/files/xpkgwedge.def
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/xpkgwedge/files/xpkgwedge.def,v
retrieving revision 1.12
diff -b -u -r1.12 xpkgwedge.def
--- pkgtools/xpkgwedge/files/xpkgwedge.def	31 Jul 2004 01:42:06 -0000	1.12
+++ pkgtools/xpkgwedge/files/xpkgwedge.def	19 Jan 2006 00:56:09 -0000
@@ -84,6 +84,9 @@
 #undef ConfigDir
 #define ConfigDir $(X11_ROOT)/lib/X11/config
 
+#undef ManDirectoryRoot
+#define ManDirectoryRoot Concat(ProjectRoot,/@PKGMANDIR@)
+
 /*
  * This emits dual -I and -L options to cc automatically, one for the actual
  * X11 root, and one for the user-set prefix.


 Jeremy C. Reed

 	  	 	 technical support & remote administration
	  	 	 http://www.pugetsoundtechnology.com/