From 04a8dd6ea0aaa2fb91f194ca6ff7c122b431f7d3 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Fri, 8 Dec 2006 14:53:41 +0000 Subject: [PATCH] =?utf8?q?Fix=20building=20on=20fbsd,=20thanks=20to=20Dieg?= =?utf8?q?o=20Petten=C3=B2=20,=20bug=20#157389.=20Pa?= =?utf8?q?ckage-Manager:=20portage-2.1.2=5Frc2-r5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dev-java/gjdoc/ChangeLog | 7 ++- dev-java/gjdoc/Manifest | 30 +++++------- dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch | 56 ++++++++++++++++++++++ dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild | 15 +++++- 4 files changed, 87 insertions(+), 21 deletions(-) create mode 100644 dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog index 32769157dbdf..36ad93a10911 100644 --- a/dev-java/gjdoc/ChangeLog +++ b/dev-java/gjdoc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/gjdoc # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.19 2006/12/08 10:10:09 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.20 2006/12/08 14:53:41 caster Exp $ + + 08 Dec 2006; Vlastimil Babka + +files/gjdoc-0.7.7-gcp.patch, gjdoc-0.7.7-r1.ebuild: + Fix building on fbsd, thanks to Diego Pettenò , bug + #157389. 08 Dec 2006; Christian Faulhammer gjdoc-0.7.7-r1.ebuild: diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest index 8b14b2974e82..da35ed6ba953 100644 --- a/dev-java/gjdoc/Manifest +++ b/dev-java/gjdoc/Manifest @@ -1,23 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gjdoc 137 RMD160 fea337e7175295d679564390bb6a2006cf54966d SHA1 a2358dbdcbe9ae1f8e2e48c98e282f8883e7eb1e SHA256 f0d9f62aa69c3e5ad7a19806816b8e744388bf3f063e55f19e2f9bfbd32438f0 MD5 09c41d12fbdde13c5d1d4a64aa66bd0f files/gjdoc 137 RMD160 fea337e7175295d679564390bb6a2006cf54966d files/gjdoc 137 SHA256 f0d9f62aa69c3e5ad7a19806816b8e744388bf3f063e55f19e2f9bfbd32438f0 files/gjdoc 137 +AUX gjdoc-0.7.7-gcp.patch 1890 RMD160 f1b2a3619f87e157c0cfb0888cf00869cb41ae6d SHA1 f8b2565a2d5b8b46f4be02e3b4c12607a9d47bd6 SHA256 40ef075e32b931ab01b0594238a96b2650beccb303f23f5e4bbb66eb10219774 +MD5 088a16246eab6f52821fcc3973455ded files/gjdoc-0.7.7-gcp.patch 1890 +RMD160 f1b2a3619f87e157c0cfb0888cf00869cb41ae6d files/gjdoc-0.7.7-gcp.patch 1890 +SHA256 40ef075e32b931ab01b0594238a96b2650beccb303f23f5e4bbb66eb10219774 files/gjdoc-0.7.7-gcp.patch 1890 DIST gjdoc-0.7.7.tar.gz 731115 RMD160 118f8f710d22559cbb49eee73377fc733dcf86e3 SHA1 d21ad5a12a283046735a5755dc8ca4ab51bd04bb SHA256 6cae05c4c49cd7f33650403a2fdbf1248c20751fa11099ca37bd34a4f1a0bd59 -EBUILD gjdoc-0.7.7-r1.ebuild 1821 RMD160 a5911c856443608985010a25b5461b9284fe86ee SHA1 d0b8c406d3a4fed59d518223f1d6f64b3adec487 SHA256 0177be1850704718cc918eba35d4f2b8975f5d8076216c1b87bb31cd1af07af3 -MD5 b5f62f9ee189478491cda0b5d15ec709 gjdoc-0.7.7-r1.ebuild 1821 -RMD160 a5911c856443608985010a25b5461b9284fe86ee gjdoc-0.7.7-r1.ebuild 1821 -SHA256 0177be1850704718cc918eba35d4f2b8975f5d8076216c1b87bb31cd1af07af3 gjdoc-0.7.7-r1.ebuild 1821 +EBUILD gjdoc-0.7.7-r1.ebuild 1993 RMD160 18eebebfe7e41013da767c68a244412a7e5d0f2f SHA1 d72ccd05e20abf48a41d17fcbd9506ef1ce223a7 SHA256 576802b69557bbfdcb33f7d4c7c21b173108eb20985a638eb239b8d310d96aae +MD5 947bcb002bcee9d9c88fcf1e923d86ad gjdoc-0.7.7-r1.ebuild 1993 +RMD160 18eebebfe7e41013da767c68a244412a7e5d0f2f gjdoc-0.7.7-r1.ebuild 1993 +SHA256 576802b69557bbfdcb33f7d4c7c21b173108eb20985a638eb239b8d310d96aae gjdoc-0.7.7-r1.ebuild 1993 EBUILD gjdoc-0.7.7.ebuild 1746 RMD160 724531534d4203322f373f7fa86713bbbe7981fa SHA1 786d364ff5c175075334736c8e70aed0644fa2be SHA256 76270f905b231c5c529bc1090d6d6fb096284d50eb90d080357b4ed2b231ec95 MD5 f351bb54bf770f96bce566fd3b5082cd gjdoc-0.7.7.ebuild 1746 RMD160 724531534d4203322f373f7fa86713bbbe7981fa gjdoc-0.7.7.ebuild 1746 SHA256 76270f905b231c5c529bc1090d6d6fb096284d50eb90d080357b4ed2b231ec95 gjdoc-0.7.7.ebuild 1746 -MISC ChangeLog 2485 RMD160 3b7205e6f286769c8791f2eea93ef6270deedf5b SHA1 b623e071d08711d0a127fe2353290b608f264655 SHA256 42669e22412717371353a861b7e3f1aaae9de7c9bf585fda2c5ee61e900d8881 -MD5 00529e58cd37b2edc39834f5083780e2 ChangeLog 2485 -RMD160 3b7205e6f286769c8791f2eea93ef6270deedf5b ChangeLog 2485 -SHA256 42669e22412717371353a861b7e3f1aaae9de7c9bf585fda2c5ee61e900d8881 ChangeLog 2485 +MISC ChangeLog 2681 RMD160 b1f96f36adafc2977eeca6f4090c9c6d009bcc3a SHA1 6a710a06aed1628debf9885341d2864ef980cc12 SHA256 543d6761204871358c5ec171c2d497a9b469d74818ed80235d9ae55d5723fc7a +MD5 cf3d3bb1b8ea6ff48804a45a227b25d6 ChangeLog 2681 +RMD160 b1f96f36adafc2977eeca6f4090c9c6d009bcc3a ChangeLog 2681 +SHA256 543d6761204871358c5ec171c2d497a9b469d74818ed80235d9ae55d5723fc7a ChangeLog 2681 MISC metadata.xml 535 RMD160 2b7405a531e1016213ff45e73146de8f65911368 SHA1 c87752dba3c878d25f9ebb48ccf5b7e940b7fa66 SHA256 c8a221fbe6044b6dc49c2bd6de27a17f30e15734342c66ae5df87d510981f788 MD5 0d8df1cd88e392aa059af56ac1d368e9 metadata.xml 535 RMD160 2b7405a531e1016213ff45e73146de8f65911368 metadata.xml 535 @@ -28,10 +29,3 @@ SHA256 e02a20a8d58a42306d2555933a40148d2c424400937f57569cc93c2f2ccba003 files/di MD5 bc0a9235adbff62eeb2f2020c3a39b42 files/digest-gjdoc-0.7.7-r1 235 RMD160 76a21bad196c14964e86a66145c0b778f1293103 files/digest-gjdoc-0.7.7-r1 235 SHA256 e02a20a8d58a42306d2555933a40148d2c424400937f57569cc93c2f2ccba003 files/digest-gjdoc-0.7.7-r1 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFeToNNQqtfCuFneMRAkGfAKCACoTgNWMXpbeFaY/pK5rx1wqSAQCdFSUI -8Nu/QoXB2lgVuacVqcVrdDk= -=1/bk ------END PGP SIGNATURE----- diff --git a/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch b/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch new file mode 100644 index 000000000000..a09b745931a7 --- /dev/null +++ b/dev-java/gjdoc/files/gjdoc-0.7.7-gcp.patch @@ -0,0 +1,56 @@ +Index: gjdoc-0.7.7/configure.ac +=================================================================== +--- gjdoc-0.7.7.orig/configure.ac ++++ gjdoc-0.7.7/configure.ac +@@ -101,6 +101,38 @@ AC_SUBST(jni_linkflag) + AM_CONDITIONAL([ENABLE_XMLDOCLET], [test x${enable_xmldoclet} = xyes]) + AM_CONDITIONAL([ENABLE_NATIVE], [test x${enable_native} = xyes]) + ++dnl Start testing for cp -u availability ++dnl Fallback to rsync otherwise ++ ++AC_MSG_CHECKING([for working cp -u]) ++ ++: ${TMPDIR=/tmp} ++{ ++ tmp=` ++ (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null ++ ` && test -n "$tmp" && test -d "$tmp" ++} || { ++ tmp=$TMPDIR/foo$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || AC_MSG_ERROR([Unable to create a temporary directory]) ++ ++touch "$tmp/origin" ++if cp -u "$tmp/origin" "$tmp/destination" 2>/dev/null; then ++ AC_MSG_RESULT([yes]) ++ CP_U="cp -u" ++else ++ AC_MSG_RESULT([no]) ++ AC_CHECK_PROG([CP_U], [rsync], [rsync -u]) ++fi ++ ++rm -rf "$tmp/origin" ++ ++if test "x$CP_U" = "x"; then ++ AC_MSG_ERROR([Unable to find a workign cp -u implementation.]) ++fi ++ ++AC_SUBST([CP_U]) ++ + AC_CONFIG_FILES([gjdoc.sh src/resources/version.properties], [chmod +x gjdoc.sh]) + + AC_OUTPUT([Makefile docs/Makefile]) +Index: gjdoc-0.7.7/Makefile.am +=================================================================== +--- gjdoc-0.7.7.orig/Makefile.am ++++ gjdoc-0.7.7/Makefile.am +@@ -385,7 +385,7 @@ gjdoc_resources_src = $(patsubst %, $(sr + + gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src) + for res in $(gjdoc_resources) ; \ +- do cp -u $(srcdir)/src/resources/$$res $$res ; done ++ do $(CP_U) $(srcdir)/src/resources/$$res $$res ; done + $(JAR) cfm $@ $(srcdir)/gjdoc.manifest \ + $(gjdoc_resources) \ + -C src/resources version.properties \ diff --git a/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild b/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild index 8b22d573943c..c45ffe05337f 100644 --- a/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild +++ b/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild,v 1.4 2006/12/08 10:10:09 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.7-r1.ebuild,v 1.5 2006/12/08 14:53:41 caster Exp $ -inherit java-pkg-2 +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools java-pkg-2 DESCRIPTION="A javadoc compatible Java source documentation generator." HOMEPAGE="http://www.gnu.org/software/cp-tools/" @@ -29,6 +32,14 @@ DEPEND=">=dev-java/antlr-2.7.1 RDEPEND=">=virtual/jre-1.4 >=dev-java/antlr-2.7.1" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-gcp.patch" + AT_M4DIR="m4" eautoreconf +} + src_compile() { # I think that configure will do --enable-native if it finds gcj # so we'll disable it explicitly -- 2.26.2