diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-08-17 05:20:26 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-08-17 05:20:26 +0000 |
| commit | 21af1d63f295eae185878be30911f2cac243e0f4 (patch) | |
| tree | f69c9208e5af755f1336b437b6e02ef1356e463f /java | |
| parent | b1004eb606733fdc8a0ae7f526b938d87c2f269a (diff) | |
| download | ports-21af1d63f295eae185878be30911f2cac243e0f4.tar.gz ports-21af1d63f295eae185878be30911f2cac243e0f4.zip | |
* Add registervm and unregistervm [1]
* Do not hardcode gcc version number as far as possible
Suggested by: hq [1]
Notes
Notes:
svn path=/head/; revision=170839
Diffstat (limited to 'java')
| -rw-r--r-- | java/java-gcj-compat/Makefile | 16 | ||||
| -rw-r--r-- | java/java-gcj-compat/pkg-plist | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/java/java-gcj-compat/Makefile b/java/java-gcj-compat/Makefile index 3e3b767e0d39..6d82ac847a0a 100644 --- a/java/java-gcj-compat/Makefile +++ b/java/java-gcj-compat/Makefile @@ -7,7 +7,7 @@ PORTNAME= java-gcj-compat PORTVERSION= 1.0.56 # =< requires gcc-4.2 (HEAD) -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= ftp://sources.redhat.com/pub/rhug/ @@ -18,6 +18,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/ BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc BUILD_DEPENDS+= ecj:${PORTSDIR}/java/ecj-bootstrap +RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt RUN_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc RUN_DEPENDS+= ecj:${PORTSDIR}/java/ecj-bootstrap @@ -27,7 +28,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PYTHON= yes PLIST_SUB= ARCH=${ARCH} -CONFIGURE_ARGS+="-with-origin-name=gcj41" "--with-gcc-suffix=41" \ +CONFIGURE_ARGS+="-with-origin-name=gcj${GCJVER}" "--with-gcc-suffix=${GCJVER}" \ "--with-arch-directory=${ARCH}" "--disable-symlinks" \ "--with-classpath-security=${LOCALBASE}/lib/security/classpath.security" \ "--with-security-directory=${LOCALBASE}/etc/java/security/security.d" @@ -37,10 +38,11 @@ pre-configure: @${REINPLACE_CMD} -e "s|%%GCCSUFFIX%%|${GCJVER}|" ${WRKSRC}/java.c post-install: - @${LN} -sf ${PREFIX}/lib/jvm/java-1.4.2-gcj41-1.4.2.0 ${PREFIX}/lib/jvm/java-gcj - @${LN} -sf ${LOCALBASE}/bin/gcj${GCJVER} ${PREFIX}/lib/jvm/java-gcj/bin/gcj - @${LN} -sf ${LOCALBASE}/bin/gij${GCJVER} ${PREFIX}/lib/jvm/java-gcj/bin/gij - @${LN} -sf ${LOCALBASE}/bin/gcj-dbtool${GCJVER} ${PREFIX}/lib/jvm/java-gcj/bin/gcj-dbtool - @${LN} -sf ${LOCALBASE}/bin/gjdoc ${PREFIX}/lib/jvm/java-gcj/bin/gjdoc + @${LN} -sf ${PREFIX}/lib/jvm/java-1.4.2-gcj${GCJVER}-1.4.2.0 ${PREFIX}/lib/jvm/java-gcj${GCJVER} + @${LN} -sf ${LOCALBASE}/bin/gcj${GCJVER} ${PREFIX}/lib/jvm/java-gcj${GCJVER}/bin/gcj + @${LN} -sf ${LOCALBASE}/bin/gij${GCJVER} ${PREFIX}/lib/jvm/java-gcj${GCJVER}/bin/gij + @${LN} -sf ${LOCALBASE}/bin/gcj-dbtool${GCJVER} ${PREFIX}/lib/jvm/java-gcj${GCJVER}/bin/gcj-dbtool + @${LN} -sf ${LOCALBASE}/bin/gjdoc ${PREFIX}/lib/jvm/java-gcj${GCJVER}/bin/gjdoc + @${LOCALBASE}/bin/registervm "${PREFIX}/lib/jvm/java-1.4.2-gcj${GCJVER}-1.4.2.0/bin/java # GCJ${GCJVER}" .include <bsd.port.mk> diff --git a/java/java-gcj-compat/pkg-plist b/java/java-gcj-compat/pkg-plist index 66c6f05dbc9e..163351abd50b 100644 --- a/java/java-gcj-compat/pkg-plist +++ b/java/java-gcj-compat/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/java" bin/rebuild-gcj-db bin/aot-compile bin/aot-compile-rpm @@ -16,11 +17,12 @@ lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/rmic lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/javah lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/javac lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/rmiregistry -lib/jvm/java-gcj +lib/jvm/java-gcj41 %%PYTHON_SITELIBDIR%%/aotcompile.py %%PYTHON_SITELIBDIR%%/aotcompile.pyc %%PYTHON_SITELIBDIR%%/classfile.py %%PYTHON_SITELIBDIR%%/classfile.pyc +@exec %%LOCALBASE%%/bin/registervm "%D/lib/jvm/java-1.4.2-gcj41-1.4.2.0/bin/java # GCJ41" @dirrm lib/jvm/java-1.4.2-gcj41-1.4.2.0/jre/bin @dirrm lib/jvm/java-1.4.2-gcj41-1.4.2.0/jre/lib/%%ARCH%% @dirrm lib/jvm/java-1.4.2-gcj41-1.4.2.0/jre/lib |