diff options
| author | dsainty <dsainty@pkgsrc.org> | 2006-10-29 07:51:28 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2006-10-29 07:51:28 +0000 |
| commit | 68a4d46aaff13d7105d66918b13653ba40791af2 (patch) | |
| tree | 37353e87d5ee9b51d0c262a871a59d109cf04288 /devel | |
| parent | 8f5f0ccaa4bb2b34565e45ea338010800e3e9c7f (diff) | |
| download | pkgsrc-68a4d46aaff13d7105d66918b13653ba40791af2.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/doxygen/Makefile | 9 | ||||
| -rw-r--r-- | devel/doxygen/distinfo | 3 | ||||
| -rw-r--r-- | devel/doxygen/patches/patch-ai | 31 |
3 files changed, 34 insertions, 9 deletions
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index e41958e7d36..1281088c797 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -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 @@ CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc 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 --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo index 4bf37b734ed..9914408c994 100644 --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -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-ac) = 5523e5b146436a50b008f963a0b809379a9e4974 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15 SHA1 (patch-ah) = aa5a701f0586aa99fdb140f8d7fa63ca14d9f460 +SHA1 (patch-ai) = 0dadf92fdf0b737a6f5bf9467d259581ac8fc33d diff --git a/devel/doxygen/patches/patch-ai b/devel/doxygen/patches/patch-ai new file mode 100644 index 00000000000..82817781f92 --- /dev/null +++ b/devel/doxygen/patches/patch-ai @@ -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 |