aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/java-gcj-compat/Makefile4
-rw-r--r--java/java-gcj-compat/files/patch-Makefile.in9
2 files changed, 3 insertions, 10 deletions
diff --git a/java/java-gcj-compat/Makefile b/java/java-gcj-compat/Makefile
index 318b64cea0a0..406a5ef0c7b0 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 # intentionally not upgrading
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= ftp://sources.redhat.com/pub/rhug/
@@ -16,9 +16,11 @@ COMMENT= A collection of wrapper scripts, symlinks and jar files for GCJ
BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc
+BUILD_DEPENDS+= ecj:${PORTSDIR}/java/ecj-bootstrap
RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
RUN_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+= ecj:${PORTSDIR}/java/ecj-bootstrap
GCJVER=41
GNU_CONFIGURE= yes
diff --git a/java/java-gcj-compat/files/patch-Makefile.in b/java/java-gcj-compat/files/patch-Makefile.in
index 465df2dfb8ae..07ce88d6b9e8 100644
--- a/java/java-gcj-compat/files/patch-Makefile.in
+++ b/java/java-gcj-compat/files/patch-Makefile.in
@@ -11,12 +11,3 @@
tools_jar_source_files = \
$(top_builddir)/com/sun/tools/javac/Config.java \
com/sun/tools/javac/Main.java \
-@@ -553,7 +553,7 @@
- ln -sf $(GJDOC) $(DESTDIR)$(SDK_BIN_DIR)/javadoc
- ln -sf $(GCJ_BIN_DIR)/grmic$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmic
- ln -sf $(GCJ_BIN_DIR)/gjnih$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/javah
-- ln -sf $(GCJ_BIN_DIR)/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac
-+ ln -sf $(GCJ_BIN_DIR)/gcj$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/javac
- ln -sf $(GCJ_BIN_DIR)/grmiregistry$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmiregistry
- ln -sf $(GCJ_BIN_DIR)/grmiregistry$(gcc_suffix) $(DESTDIR)$(JRE_BIN_DIR)/rmiregistry
- @INSTALL_SYMLINKS_TRUE@ $(mkinstalldirs) $(DESTDIR)$(prefix)/bin