diff options
| author | joerg <joerg@pkgsrc.org> | 2007-07-28 00:10:36 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-07-28 00:10:36 +0000 |
| commit | 3a138c6e50501fa0c1adbe331135e26a3f2d643a (patch) | |
| tree | bc20544a759cdd25f9ab7314fe03a1d7cc4ca383 /x11/xman | |
| parent | e448cb48c1b30410d797f16b2f15676fc581ac10 (diff) | |
| download | pkgsrc-3a138c6e50501fa0c1adbe331135e26a3f2d643a.tar.gz | |
When MANCONF is specified in the environment, use it. This allows
cross-compilation by hard-coding the real value as done for NetBSD.
Diffstat (limited to 'x11/xman')
| -rw-r--r-- | x11/xman/Makefile | 8 | ||||
| -rw-r--r-- | x11/xman/distinfo | 4 | ||||
| -rw-r--r-- | x11/xman/patches/patch-aa | 18 | ||||
| -rw-r--r-- | x11/xman/patches/patch-ab | 22 |
4 files changed, 50 insertions, 2 deletions
diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 0c9c88d4476..956042c331c 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/06/19 09:39:13 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2007/07/28 00:10:36 joerg Exp $ # DISTNAME= xman-1.0.2 @@ -17,5 +17,11 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +CONFIGURE_ARGS+= MANCONF=/etc/man.conf +.endif + .include "../../x11/libXaw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xman/distinfo b/x11/xman/distinfo index 80bcbf8cf51..59e9b3bc6d1 100644 --- a/x11/xman/distinfo +++ b/x11/xman/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/04/10 13:46:59 joerg Exp $ +$NetBSD: distinfo,v 1.2 2007/07/28 00:10:36 joerg Exp $ SHA1 (xman-1.0.2.tar.bz2) = b3d53eedce31071dfc3bc981b04e960d4f830527 RMD160 (xman-1.0.2.tar.bz2) = 5a84755d1415341b528c8d2cd8cd9db4c2e39b5e Size (xman-1.0.2.tar.bz2) = 138214 bytes +SHA1 (patch-aa) = fffdcd64260e5e7977c5ce9be5c6793ce0d457bc +SHA1 (patch-ab) = c4fc8b25c246140fe90757f88eb1b859a5609e28 diff --git a/x11/xman/patches/patch-aa b/x11/xman/patches/patch-aa new file mode 100644 index 00000000000..64549e09a43 --- /dev/null +++ b/x11/xman/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1 2007/07/28 00:10:37 joerg Exp $ + +--- configure.ac.orig 2007-07-28 02:05:42.000000000 +0200 ++++ configure.ac +@@ -64,10 +64,12 @@ fi + XAW_CHECK_XPRINT_SUPPORT(XMAN) + + # Check for man page config files ++if test x"$MANCONF" = x; then + AC_CHECK_FILE([/etc/man.conf], [MANCONF="/etc/man.conf"], + AC_CHECK_FILE([/etc/man.config], [MANCONF="/etc/man.config"], + AC_CHECK_FILE([/etc/manpath.config], [MANCONF="/etc/manpath.config"]))) +- ++fi ++ + if test x$MANCONF != x ; then + AC_DEFINE_UNQUOTED(MANCONF, "$MANCONF", + [Define to path to man config file if you have one]) diff --git a/x11/xman/patches/patch-ab b/x11/xman/patches/patch-ab new file mode 100644 index 00000000000..f3610453944 --- /dev/null +++ b/x11/xman/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2007/07/28 00:10:37 joerg Exp $ + +--- configure.orig 2007-07-28 02:06:24.000000000 +0200 ++++ configure +@@ -3460,8 +3460,8 @@ echo "$as_me: error: No suitable version + { (exit 1); exit 1; }; } + fi + +- + # Check for man page config files ++if test x"$MANCONF" = x; then + echo "$as_me:$LINENO: checking for /etc/man.conf" >&5 + echo $ECHO_N "checking for /etc/man.conf... $ECHO_C" >&6 + if test "${ac_cv_file__etc_man_conf+set}" = set; then +@@ -3527,6 +3527,7 @@ fi + + fi + ++fi + + if test x$MANCONF != x ; then + |