pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/xpkgwedge Force-set ManPath on Debian in orde...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fa62759d0df
branches:  trunk
changeset: 576310:2fa62759d0df
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jun 06 03:45:17 2010 +0000

description:
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).

diffstat:

 pkgtools/xpkgwedge/Makefile            |  4 ++--
 pkgtools/xpkgwedge/files/xpkgwedge.def |  9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r c0e61eabfd90 -r 2fa62759d0df pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sun Jun 06 02:39:31 2010 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sun Jun 06 03:45:17 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/06 03:45:17 dholland Exp $
 
-DISTNAME=      xpkgwedge-1.16
+DISTNAME=      xpkgwedge-1.17
 CATEGORIES=    pkgtools devel x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r c0e61eabfd90 -r 2fa62759d0df pkgtools/xpkgwedge/files/xpkgwedge.def
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def    Sun Jun 06 02:39:31 2010 +0000
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def    Sun Jun 06 03:45:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xpkgwedge.def,v 1.12 2004/07/31 01:42:06 xtraeme Exp $ */
+/*     $NetBSD: xpkgwedge.def,v 1.13 2010/06/06 03:45:17 dholland Exp $        */
 
 #ifdef BeforeVendorCF
 
@@ -121,4 +121,11 @@
 #define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
 #endif
 
+#ifdef __linux__
+#if LinuxDistribution == LinuxDebian
+#undef ManPath
+#define ManPath $(PREFIX)/man
+#endif /* Debian */
+#endif /* __linux__ */
+
 #endif /* AfterVendorCF */



Home | Main Index | Thread Index | Old Index