5 files changed, 48 insertions, 7 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 0203c0d3791e..6a4691a32e64 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -12,9 +12,11 @@ MASTER_SITES=	ftp://ftp.santafe.edu/pub/swarm/src/swarm/
 
 MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 
+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs21
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		BLT24.2:${PORTSDIR}/x11-toolkits/blt
 
+USE_JAVA=	1.3+
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_LIBTOOL=	yes
@@ -26,4 +28,7 @@ CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tkscriptdir=${PREFIX}/lib/tk8.3 \
 		--enable-subdirs
 
+post-install:
+	${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+
 .include <bsd.port.mk>
diff --git a/devel/swarm/files/patch-makefile b/devel/swarm/files/patch-makefile
new file mode 100644
index 000000000000..0d569b430c7d
--- /dev/null
+++ b/devel/swarm/files/patch-makefile
@@ -0,0 +1,16 @@
+diff -ruN swarm.orig/files/patch-ae swarm/files/patch-ae
+--- swarm.orig/files/patch-ae	Thu Jan  1 08:00:00 1970
++++ swarm/files/patch-ae	Mon May 20 20:58:48 2002
+@@ -0,0 +1,11 @@
++--- java/c/Makefile.in.orig	Sun Feb 13 01:50:41 2000
+++++ java/c/Makefile.in	Mon May 20 18:27:20 2002
++@@ -71,7 +71,7 @@
++ 	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(STUBSCURRENT):$(STUBSREVISION):$(STUBSAGE) -rpath $(libdir) $^
++ 
++ $(_LIBJAVASWARM_LA): $(_LIBJAVASWARMSTUBS_LA) $(libjavaswarm_la_OBJECTS)
++-	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(CURRENT):$(REVISION):$(AGE) -L$(abs_top_builddir)/libobjc -rpath $(libdir) $(libjavaswarm_la_OBJECTS) $(_LIBJAVASWARMSTUBS_LA) -L$(abs_top_builddir)/src $(SWARMLIBS) -lobjc
+++	$(LIBTOOL) --mode=link $(OBJC) $(CFLAGS) -o $@ -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(libdir) $(javaswarmstubs_OBJECTS) $(javaswarm_OBJECTS) $(foreach module,$(SWARMMODULES),$(top_builddir)/src/$(module)/*.lo) $(filter-out $(top_builddir)/libobjc/nil_method.lo,$(wildcard $(top_builddir)/libobjc/*.lo)) $(SUPPORTLDFLAGS) $(SYSLIBS)
++ 
++ ENTRYCMD=-e @JAVASWARM_DLL_ENTRY@
++ 
+
diff --git a/devel/swarm/files/patch-objc-features.texi b/devel/swarm/files/patch-objc-features.texi
new file mode 100644
index 000000000000..1d532ad1ada1
--- /dev/null
+++ b/devel/swarm/files/patch-objc-features.texi
@@ -0,0 +1,13 @@
+--- libobjc/doc/objc-features.texi.orig	Mon Nov 11 17:43:05 2002
++++ libobjc/doc/objc-features.texi	Mon Nov 11 17:49:43 2002
+@@ -2,6 +2,10 @@
+ @c %**start of header 
+ @setfilename objc-features.info
+ @settitle GNU Objective-C runtime features
++@dircategory Programming & development tools.
++@direntry
++* GNU Objective-C runtime features: (objc-features).	GNU Objective-C runtime features
++@end direntry
+ @setchapternewpage odd
+ @c %**end of header
+      
diff --git a/devel/swarm/pkg-message b/devel/swarm/pkg-message
index 08f99a1f29e0..631d676f2b22 100644
--- a/devel/swarm/pkg-message
+++ b/devel/swarm/pkg-message
@@ -1,13 +1,10 @@
 
-Please set SWARMHOME to /usr/local while using this package.
+Please set SWARMHOME to %%PREFIX%% while using this package.
 ex:
   in tcsh:
-	setenv SWARMHOME /usr/local
+	setenv SWARMHOME %%PREFIX%%
 
   in bash:
-	export SWARMHOME=/usr/local
+	export SWARMHOME=%%PREFIX%%
 
 Swarm samples can be found at ftp://ftp.swarm.org/pub/swarm/src/apps/objc/swarmapps-2.1.1.tar.gz
-
- *Note* java support is not enabled in this port.
-
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index 1cca9a713f8b..a38ce40261c8 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -1,3 +1,5 @@
+bin/javaswarm
+bin/javacswarm
 bin/libtool-swarm
 bin/m2h
 bin/make-h2x
@@ -223,7 +225,9 @@ include/swarm/tkobjc/common.h
 include/swarm/tkobjc/global.h
 include/swarm/tkobjc/internal.h
 include/swarm/tkobjc/win32dib.h
+@unexec install-info --delete %D/info/objc-features.info %D/info/dir
 info/objc-features.info
+@exec install-info %D/info/objc-features.info %D/info/dir
 lib/swarm/libactivity.a
 lib/swarm/libactivity.so
 lib/swarm/libactivity.so.5
@@ -237,6 +241,12 @@ lib/swarm/libdefobj.a
 lib/swarm/libdefobj.so
 lib/swarm/libdefobj.so.4
 lib/swarm/libmisc.a
+lib/swarm/libjavaswarm.a
+lib/swarm/libjavaswarm.so
+lib/swarm/libjavaswarm.so.1
+lib/swarm/libjavaswarmstubs.a
+lib/swarm/libjavaswarmstubs.so
+lib/swarm/libjavaswarmstubs.so.0
 lib/swarm/libmisc.so
 lib/swarm/libmisc.so.2
 lib/swarm/libobjc.a
@@ -267,6 +277,7 @@ lib/swarm/libtclobjc.so.1
 lib/swarm/libtkobjc.a
 lib/swarm/libtkobjc.so
 lib/swarm/libtkobjc.so.5
+share/swarm/swarm.jar
 @dirrm etc/swarm
 @dirrm include/swarm/activity
 @dirrm include/swarm/analysis
@@ -283,5 +294,4 @@ lib/swarm/libtkobjc.so.5
 @dirrm include/swarm/tkobjc
 @dirrm include/swarm
 @dirrm lib/swarm
-@exec mkdir %D/share/swarm
 @dirrm share/swarm