diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-07-15 16:38:06 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-07-15 16:38:06 +0000 |
| commit | 5282fe1f991a0e71da5e6f030605a8546e4a18c4 (patch) | |
| tree | 93c27d1f22fa0a22e8c1531f5f998a454eb871fa /dev-java/sun-jdk | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-5282fe1f991a0e71da5e6f030605a8546e4a18c4.tar.gz gentoo-2-5282fe1f991a0e71da5e6f030605a8546e4a18c4.tar.bz2 gentoo-2-5282fe1f991a0e71da5e6f030605a8546e4a18c4.zip | |
fix head warning, put man pages in correct place
Diffstat (limited to 'dev-java/sun-jdk')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/sun-jdk/Manifest | 5 | ||||
| -rw-r--r-- | dev-java/sun-jdk/files/sun-jdk-1.3.1.12 | 5 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild | 20 |
4 files changed, 21 insertions, 15 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index ba41d09020ae..b672b070d468 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.79 2004/07/14 20:25:47 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.80 2004/07/15 16:38:06 axxo Exp $ + + 15 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/sun-jdk-1.3.1.12, + sun-jdk-1.3.1.12.ebuild: + fix head warning, put man pages in the correct place *sun-jdk-1.3.1.12 (14 Jul 2004) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 7ff4e444d4c3..73ef63cbaa9d 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -4,7 +4,8 @@ MD5 26dabe5196081e3ef46ef80d1b7e9ca5 sun-jdk-1.4.2.04.ebuild 5980 MD5 e7c53343a73adba1109200374e655213 sun-jdk-1.5.0_beta2-r1.ebuild 8103 MD5 1906442891ab5eab96c1e7e04ec1964f sun-jdk-1.3.1.10.ebuild 4675 MD5 1a713b65cd35161e5c54bd3a4f877283 sun-jdk-1.5.0_beta1-r1.ebuild 6676 -MD5 f34698cf57de50779cbf2f5cd7055023 sun-jdk-1.3.1.12.ebuild 4675 +MD5 9ee66a120393e919eadd5bc55177af35 sun-jdk-1.3.1.12.ebuild 4669 +MD5 4e59ba7c9aee0a95071a440d1341c3ad .sun-jdk-1.4.2.05.ebuild.swp 16384 MD5 04dd51ce8dfe00cd681076b0e0e9000c sun-jdk-1.4.2.03.ebuild 5992 MD5 65c2bc21da2262ddeb940d657dcc9ff0 sun-jdk-1.4.1.06.ebuild 3316 MD5 234d28ba53964b7c9d717ee01d6f1a7b sun-jdk-1.4.2.04-r2.ebuild 7487 @@ -16,7 +17,7 @@ MD5 48704791b468465f9c30c67e4cfd0df3 files/sun-jdk-1.5.0_beta1 502 MD5 1a7472b94bb4c5206baadc73ed865f52 files/sun-jdk-1.5.0_beta2 478 MD5 130466b740026a70232ca65aaa34946c files/sun-jdk-1.3.1.09 444 MD5 7a5b975a887179b46f0865b3c3675c8b files/sun-jdk-1.3.1.10 444 -MD5 03c3650c15d7652c3531201d9e823eee files/sun-jdk-1.3.1.12 448 +MD5 4c59c821ca5d650701d412420239d3ee files/sun-jdk-1.3.1.12 479 MD5 8e003f54a8c41088ba3c804cbaf96656 files/sun-jdk-1.4.1.06 445 MD5 825c69f533004f12b0011651509317e7 files/sun-jdk-1.4.2.03 499 MD5 4602194a472b06ce3d9762a95aa1bc64 files/sun-jdk-1.4.2.04 499 diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.12 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.12 index 67eb4761ff77..87234f0bb351 100644 --- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.12 +++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.12,v 1.1 2004/07/14 20:25:47 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.12,v 1.2 2004/07/15 16:38:06 axxo Exp $ VERSION="Sun JDK @PV@" JAVA_HOME=/opt/@P@ @@ -8,4 +8,5 @@ JDK_HOME=/opt/@P@ JAVAC=${JAVA_HOME}/bin/javac ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" ADDLDPATH="/opt/@P@/jre/lib" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH" +MANPATH="/opt/@P@/man" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH" diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild index d6026a525021..e65750da9471 100644 --- a/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild,v 1.1 2004/07/14 20:25:47 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.12.ebuild,v 1.2 2004/07/15 16:38:06 axxo Exp $ IUSE="doc mozilla" @@ -51,23 +51,25 @@ src_unpack() { chmod +x install.sfx ./install.sfx rm install.sfx + + sed "s/head -1/head -n 1/" -i ${MY_P}/bin/.java_wrapper } src_install () { - local dirs="bin include include-old jre lib" + local dirs="bin include include-old jre lib man" dodir /opt/${P} for i in ${dirs} ; do if [ "${i}" == "bin" ] ; then dodir /opt/${P}/${i} - cp -a ${i}/.java_wrapper ${D}/opt/${P}/bin/ - cp -a ${i}/* ${D}/opt/${P}/bin/ + cp -dPR ${i}/.java_wrapper ${D}/opt/${P}/bin/ + cp -dPR ${i}/* ${D}/opt/${P}/bin/ elif [ "${i}" == "jre" ] ; then dodir /opt/${P}/${i} dodir /opt/${P}/${i}/bin - cp -a ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/ - cp -a ${i}/bin/* ${D}/opt/${P}/${i}/bin/ - cp -a ${i}/CHANGES \ + cp -dPR ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/ + cp -dPR ${i}/bin/* ${D}/opt/${P}/${i}/bin/ + cp -dPR ${i}/CHANGES \ ${i}/COPYRIGHT \ ${i}/ControlPanel.html \ ${i}/LICENSE \ @@ -77,15 +79,13 @@ src_install () { ${i}/plugin \ ${D}/opt/${P}/${i}/ else - cp -a ${i} ${D}/opt/${P}/ + cp -dPR ${i} ${D}/opt/${P}/ fi done dodoc COPYRIGHT README LICENSE dohtml README.html - doman man/man1/*.1 - dodir /opt/${P}/share/ cp -a demo src.jar ${D}/opt/${P}/share/ |