Sun Jun 6 03:45:17 2010 UTC ()
Force-set ManPath on Debian in order to work around silly things Debian
ships in their imake templates, which otherwise result in pkgsrc man pages
landing in /usr/share/man. PR 38248 (and possibly others).


(dholland)
diff -r1.78 -r1.79 pkgsrc/pkgtools/xpkgwedge/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/xpkgwedge/files/xpkgwedge.def
cvs diff -r1.78 -r1.79 pkgsrc/pkgtools/xpkgwedge/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/xpkgwedge/Attic/Makefile 2010/03/21 16:29:42 1.78
+++ pkgsrc/pkgtools/xpkgwedge/Attic/Makefile 2010/06/06 03:45:17 1.79
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.78 2010/03/21 16:29:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.79 2010/06/06 03:45:17 dholland Exp $
2 2
3DISTNAME= xpkgwedge-1.16 3DISTNAME= xpkgwedge-1.17
4CATEGORIES= pkgtools devel x11 4CATEGORIES= pkgtools devel x11
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 9HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
10COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE} 10COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE}
11LICENSE= original-bsd 11LICENSE= original-bsd
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16WRKSRC= ${WRKDIR} 16WRKSRC= ${WRKDIR}
cvs diff -r1.12 -r1.13 pkgsrc/pkgtools/xpkgwedge/files/Attic/xpkgwedge.def (expand / switch to unified diff)

--- pkgsrc/pkgtools/xpkgwedge/files/Attic/xpkgwedge.def 2004/07/31 01:42:06 1.12
+++ pkgsrc/pkgtools/xpkgwedge/files/Attic/xpkgwedge.def 2010/06/06 03:45:17 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: xpkgwedge.def,v 1.12 2004/07/31 01:42:06 xtraeme Exp $ */ 1/* $NetBSD: xpkgwedge.def,v 1.13 2010/06/06 03:45:17 dholland Exp $ */
2 2
3#ifdef BeforeVendorCF 3#ifdef BeforeVendorCF
4 4
5/* 5/*
6 * OS-specific overrides for Interix to make it behave similarly to NetBSD 6 * OS-specific overrides for Interix to make it behave similarly to NetBSD
7 * when creating binaries for pkgsrc. 7 * when creating binaries for pkgsrc.
8 */ 8 */
9#ifdef __INTERIX 9#ifdef __INTERIX
10#undef ForceNormalLib /* this is always YES on Interix */ 10#undef ForceNormalLib /* this is always YES on Interix */
11#define NullMakeCommand @ true 11#define NullMakeCommand @ true
12#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH) 12#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
13 13
14#ifdef UseInstalled  14#ifdef UseInstalled
@@ -111,14 +111,21 @@ InstallNamedTargetNoClobber(install,file @@ -111,14 +111,21 @@ InstallNamedTargetNoClobber(install,file
111#endif /* InstallAppDefaultsLong */ 111#endif /* InstallAppDefaultsLong */
112 112
113#ifdef UseInstalled 113#ifdef UseInstalled
114/* 114/*
115 * We need to redefine ImakeCmd so that imake will look in both 115 * We need to redefine ImakeCmd so that imake will look in both
116 * $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before* 116 * $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before*
117 * looking in the standard X11 config directory to override any 117 * looking in the standard X11 config directory to override any
118 * configuration files installed there. 118 * configuration files installed there.
119 */ 119 */
120#undef ImakeCmd 120#undef ImakeCmd
121#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config 121#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
122#endif 122#endif
123 123
 124#ifdef __linux__
 125#if LinuxDistribution == LinuxDebian
 126#undef ManPath
 127#define ManPath $(PREFIX)/man
 128#endif /* Debian */
 129#endif /* __linux__ */
 130
124#endif /* AfterVendorCF */ 131#endif /* AfterVendorCF */