[pkgsrc/trunk]: pkgsrc/devel/doxygen Implement the Solaris PWD fix as a patch...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a1f3d70a15b
branches:  trunk
changeset: 520769:7a1f3d70a15b
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Sun Oct 29 07:51:28 2006 +0000

description:
Implement the Solaris PWD fix as a patch instead.  The patch is the
suggested fix in the Doxygen Bugzilla for this issue.  It will presumably
exactly match the solution in the next release of Doxygen (the current
release is 1.5.0).

http://bugzilla.gnome.org/show_bug.cgi?id=366113

diffstat:

 devel/doxygen/Makefile         |   9 +--------
 devel/doxygen/distinfo         |   3 ++-
 devel/doxygen/patches/patch-ai |  31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r fd0cb350020f -r 7a1f3d70a15b devel/doxygen/Makefile
--- a/devel/doxygen/Makefile    Sun Oct 29 07:50:27 2006 +0000
+++ b/devel/doxygen/Makefile    Sun Oct 29 07:51:28 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/10/28 02:44:58 dsainty Exp $
+# $NetBSD: Makefile,v 1.54 2006/10/29 07:51:28 dsainty Exp $
 
 DISTNAME=      doxygen-1.4.7.src
 PKGNAME=       doxygen-1.4.7
@@ -24,13 +24,6 @@
 MAKE_ENV+=             PKGSRC_CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=           MAN1DIR=${PKGMANDIR}/man1
 
-# Workaround for "configure" issue under Solaris, where PWD is more likely
-# to be set to the working directory of the Pkgsrc "make" than the working
-# directory, because Solaris /bin/sh does not support PWD.  An empty PWD
-# will also fail, because configure's "test -z $PWD" will error if PWD is
-# unset (PWD should be quoted).
-CONFIGURE_ENV+=                PWD=${WRKSRC:Q}
-
 .if exists(./descr)
 PLIST_SUBST+=  CASESENSITIVE="@comment " CASEINSENSITIVE=""
 .else
diff -r fd0cb350020f -r 7a1f3d70a15b devel/doxygen/distinfo
--- a/devel/doxygen/distinfo    Sun Oct 29 07:50:27 2006 +0000
+++ b/devel/doxygen/distinfo    Sun Oct 29 07:51:28 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2006/10/28 03:18:58 dsainty Exp $
+$NetBSD: distinfo,v 1.26 2006/10/29 07:51:28 dsainty Exp $
 
 SHA1 (doxygen-1.4.7.src.tar.gz) = 42a33d676fbd471165d02f531bfe98f433ecb432
 RMD160 (doxygen-1.4.7.src.tar.gz) = 4de02b866cef53a7fd6f54e0ba90111814a9d77a
@@ -9,3 +9,4 @@
 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
 SHA1 (patch-ah) = aa5a701f0586aa99fdb140f8d7fa63ca14d9f460
+SHA1 (patch-ai) = 0dadf92fdf0b737a6f5bf9467d259581ac8fc33d
diff -r fd0cb350020f -r 7a1f3d70a15b devel/doxygen/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/doxygen/patches/patch-ai    Sun Oct 29 07:51:28 2006 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.1 2006/10/29 07:51:28 dsainty Exp $
+
+Under Solaris, PWD is more likely to be set to the working directory of the
+Pkgsrc "make" than the working directory, because Solaris /bin/sh does not
+support PWD.  An empty PWD will also fail, because configure's "test -z $PWD"
+will error if PWD is unset (PWD should be quoted).
+
+http://bugzilla.gnome.org/show_bug.cgi?id=366113
+
+--- configure.old      2006-10-17 16:40:42.000000000 -0400
++++ configure  2006-10-29 00:59:57.000000000 -0400
+@@ -432,15 +432,13 @@
+ test -f .makeconfig && rm .makeconfig
+ test -f .tmakeconfig && rm .tmakeconfig
+ 
+-if test -z $PWD; then
+-  PWD=`pwd`
+-fi
++configPWD=`pwd`
+ 
+ cat > .makeconfig <<EOF
+-DOXYGEN   = $PWD
+-TMAKEPATH = $PWD/tmake/lib/$f_platform
++DOXYGEN   = $configPWD
++TMAKEPATH = $configPWD/tmake/lib/$f_platform
+ ENV       = env TMAKEPATH=\$(TMAKEPATH)
+-TMAKE     = $PWD/tmake/bin/tmake
++TMAKE     = $configPWD/tmake/bin/tmake
+ MAKE      = $f_make
+ PERL      = $f_perl
+ RM        = rm -f