--fUYQa+Pmc3FrFX/N
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Jan Schaumann <jschauma@netmeister.org> wrote:

> Also, we should determine a way to PLIST_SUBST imake-generated
> man-page-paths:
> 
> wm/larswm (just one example) currently has PLISTS for Linux and NetBSD
> due to the fact that man-pages on the former are installed as
> man/man1/foo.1x
> while they are installed as 
> man/cat1/foo.0
> on NetBSD.
> 
> With a PLIST_SUBST, this could be simplified.

How about the attached patch for starters?  We still need to determine
the proper values for other platforms, but this should make it easier
for us to manage imake-installed man pages.

-Jan

-- 
I always said there was something fundamentally wrong with the universe.

--fUYQa+Pmc3FrFX/N
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1144
diff -b -u -r1.1144 bsd.pkg.mk
--- bsd.pkg.mk	2003/02/22 05:47:00	1.1144
+++ bsd.pkg.mk	2003/02/23 20:27:02
@@ -66,6 +66,14 @@
 
 .if defined(USE_IMAKE)
 USE_X11BASE?=		implied
+PLIST_SUBST+=		IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}	\
+			IMAKE_MAN_DIR=${IMAKE_MAN_DIR}			\
+			IMAKE_LIBMAN_DIR=${IMAKE_LIBMAN_DIR}		\
+			IMAKE_FILEMAN_DIR=${IMAKE_FILEMAN_DIR}		\
+			IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}		\
+			IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX}	\
+			IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX}	\
+			IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
 .endif
 .if defined(USE_X11BASE)
 USE_X11?=		implied
@@ -4255,7 +4263,6 @@
 	${ECHO} "Homepage:"	>>${DESCR} ; \
 	${ECHO} '${HOMEPAGE}'	>>${DESCR}	
 .endif
-
 
 #
 # For bulk build targets (bulk-install, bulk-package), the
Index: defs.NetBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defs.NetBSD.mk,v
retrieving revision 1.44
diff -b -u -r1.44 defs.NetBSD.mk
--- defs.NetBSD.mk	2003/01/15 20:55:39	1.44
+++ defs.NetBSD.mk	2003/02/23 20:27:03
@@ -95,6 +95,17 @@
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
+# imake installs manpages in weird places
+# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
+IMAKE_MAN_SOURCE_PATH=	man/cat
+IMAKE_MAN_SUFFIX=	1
+IMAKE_LIBMAN_SUFFIX=	3
+IMAKE_FILEMAN_SUFFIX=	5
+IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_MANNEWSUFFIX=	0
+
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
Index: defs.Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defs.Linux.mk,v
retrieving revision 1.44
diff -b -u -r1.44 defs.Linux.mk
--- defs.Linux.mk	2003/01/15 20:55:39	1.44
+++ defs.Linux.mk	2003/02/23 20:27:03
@@ -85,6 +85,17 @@
 USERADD?=		/usr/sbin/useradd
 ZOULARISBASE?=		/usr/pkg
 
+# imake installs manpages in weird places
+# these values from /usr/X11R6/lib/X11/config/linux.cf
+IMAKE_MAN_SOURCE_PATH=	man/man
+IMAKE_MAN_SUFFIX=	1x
+IMAKE_LIBMAN_SUFFIX=	3x
+IMAKE_FILEMAN_SUFFIX=	5x
+IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
+
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard

--fUYQa+Pmc3FrFX/N--