Make swarm buildable,

BUMP version.

PR:		ports/59075
Submitted by:	maintainer.

11 files changed, 229 insertions, 104 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 29675cf1f734..38c808007544 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -7,60 +7,60 @@
 
 PORTNAME=	swarm
 PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.santafe.edu/pub/swarm/src/swarm/
 
-MAINTAINER=	horance@freedom.ie.cycu.edu.tw
+MAINTAINER=	horance@freera.net
 COMMENT=	The Swarm Simulation System
 
 BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs21
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		BLT24.3:${PORTSDIR}/x11-toolkits/blt
 .if defined(WITH_HDF5)
 LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/graphics/hdf5
-BROKEN=		undefined references in hdf5, please deinstall hdf5 package \
-		before continue
 .endif
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		BLT24.3:${PORTSDIR}/x11-toolkits/blt
 
-BROKEN=		"Does not configure; will be removed after Feb 2"
+ONLY_FOR_ARCH=	i386
 
-.if defined(WITH_JAVA)
 USE_JAVA=	1.3+
-.endif
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+TK_VER?=	8.4
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
-		--with-tclincludedir=${PREFIX}/include/tcl8.4 \
-		--with-tkincludedir=${PREFIX}/include/tk8.4 \
-		--with-tclscriptdir=${PREFIX}/lib/tcl8.4 \
-		--with-tkscriptdir=${PREFIX}/lib/tk8.4 \
+		--with-tclincludedir=${PREFIX}/include/tcl${TK_VER} \
+		--with-tkincludedir=${PREFIX}/include/tk${TK_VER} \
+		--with-tclscriptdir=${PREFIX}/lib/tcl${TK_VER} \
+		--with-tkscriptdir=${PREFIX}/lib/tk${TK_VER} \
+		--with-jdkdir=${JAVA_HOME} \
 		--enable-subdirs
-PLIST_SUB=	JAVA="@comment "
-.if defined(WITH_JAVA)
-CONFIGURE_ARGS+=	--with-jdkdir=${JAVA_HOME}
-PLIST_SUB=	JAVA=""
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
 		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
+		${WRKSRC}/libobjc/configure
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
+		${WRKSRC}/avcall/configure
 
 pre-everything::
-.if !defined(WITH_JAVA)
+.if !defined(WITH_HDF5)
 	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> To enable java support , please define WITH_JAVA"
+	@${ECHO_MSG} "===> To enable hdf5 support , please define WITH_HDF5"
 	@${ECHO_MSG} "===>"
 .endif
 
 post-patch:
 
-
 post-install:
 	${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
 
diff --git a/devel/swarm/files/patch-ad b/devel/swarm/files/patch-Makefile.in
index c1834b386a47..c1834b386a47 100644
--- a/devel/swarm/files/patch-ad
+++ b/devel/swarm/files/patch-Makefile.in
diff --git a/devel/swarm/files/patch-ac b/devel/swarm/files/patch-ac
deleted file mode 100644
index f84028b72499..000000000000
--- a/devel/swarm/files/patch-ac
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig	Sat Mar 25 13:00:14 2000
-+++ configure	Sun Oct 20 02:30:01 2002
-@@ -1306,7 +1306,7 @@
- test -n "$OBJC" || OBJC="$CC"
- 
- test -n "$OBJCFLAGS" || OBJCFLAGS="$CFLAGS"
--OBJCFLAGS="$OBJCFLAGS -Wall -Wno-import -Wno-protocol -Werror"
-+OBJCFLAGS="$OBJCFLAGS -Wall -Wno-import -Wno-protocol"
- 
- 
- # Check whether --enable-shared or --disable-shared was given.
-@@ -1691,8 +1691,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -1706,7 +1706,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -4108,7 +4108,7 @@
- echo $ac_n "checking how to avoid implicit int return warning""... $ac_c" 1>&6
- echo "configure:4110: checking how to avoid implicit int return warning" >&5
- CFLAGS_NOWARN_IMPLICIT_INT=-Wno-implicit-int
--CFLAGS="-Wall -Werror $CFLAGS_NOWARN_IMPLICIT_INT $CFLAGS"
-+CFLAGS="-Wall $CFLAGS_NOWARN_IMPLICIT_INT $CFLAGS"
- cat > conftest.$ac_ext <<EOF
- #line 4114 "configure"
- #include "confdefs.h"
-@@ -4133,7 +4133,7 @@
- echo $ac_n "checking how to avoid unknown pragma warning""... $ac_c" 1>&6
- echo "configure:4135: checking how to avoid unknown pragma warning" >&5
- CFLAGS_NOWARN_UNKNOWN_PRAGMAS=-Wno-unknown-pragmas
--CFLAGS="-Wall -Werror $CFLAGS_NOWARN_UNKNOWN_PRAGMAS"
-+CFLAGS="-Wall $CFLAGS_NOWARN_UNKNOWN_PRAGMAS"
- cat > conftest.$ac_ext <<EOF
- #line 4139 "configure"
- #include "confdefs.h"
-@@ -5049,6 +5049,7 @@
-       JAVAINCLUDES="$JAVAINCLUDES -I$jdkincludedir/freebsd"
-       threads=green
-       proc=i386
-+      JAVACMD="\${jdkdir}/bin/java"
-     elif test -f $expand_jdkincludedir/irix/jni_md.h; then
-       JAVAINCLUDES="$JAVAINCLUDES -I$jdkincludedir/irix"
-       threads=green
diff --git a/devel/swarm/files/patch-ae b/devel/swarm/files/patch-ae
deleted file mode 100644
index 4048658cd249..000000000000
--- a/devel/swarm/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- libobjc/configure.orig	Sat Mar 25 13:00:17 2000
-+++ libobjc/configure	Sun Oct 20 02:30:33 2002
-@@ -1670,7 +1670,7 @@
- test -n "$OBJC" || OBJC="$CC"
- 
- test -n "$OBJCFLAGS" || OBJCFLAGS="$CFLAGS"
--OBJCFLAGS="-Wall -Werror $OBJCFLAGS"
-+OBJCFLAGS="-Wall $OBJCFLAGS"
-    
- 
- # Pass with no value to take the default
diff --git a/devel/swarm/files/patch-avcall::configure b/devel/swarm/files/patch-avcall::configure
new file mode 100644
index 000000000000..781dda01b1a0
--- /dev/null
+++ b/devel/swarm/files/patch-avcall::configure
@@ -0,0 +1,22 @@
+--- avcall/configure.orig	Tue Nov  4 14:25:58 2003
++++ avcall/configure	Tue Nov  4 14:29:08 2003
+@@ -1554,8 +1554,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1569,7 +1569,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/swarm/files/patch-configure b/devel/swarm/files/patch-configure
new file mode 100644
index 000000000000..0046f653c653
--- /dev/null
+++ b/devel/swarm/files/patch-configure
@@ -0,0 +1,123 @@
+--- configure.orig	Sun Mar 26 05:00:14 2000
++++ configure	Tue Nov  4 01:12:43 2003
+@@ -1306,7 +1306,7 @@
+ test -n "$OBJC" || OBJC="$CC"
+ 
+ test -n "$OBJCFLAGS" || OBJCFLAGS="$CFLAGS"
+-OBJCFLAGS="$OBJCFLAGS -Wall -Wno-import -Wno-protocol -Werror"
++OBJCFLAGS="$OBJCFLAGS -Wall -Wno-import -Wno-protocol"
+ 
+ 
+ # Check whether --enable-shared or --disable-shared was given.
+@@ -1691,8 +1691,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1706,7 +1706,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2926,6 +2926,36 @@
+ if test -n "$with_tcldir" ; then               
+   PATH=${with_tcldir}/bin:$PATH
+ fi
++# Extract the first word of "tclsh8.4", so it can be a program name with args.
++set dummy tclsh8.4; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:2933: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_tclsh84_found'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$tclsh83_found"; then
++  ac_cv_prog_tclsh84_found="$tclsh84_found" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_tclsh84_found="yes"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_tclsh84_found" && ac_cv_prog_tclsh84_found="no"
++fi
++fi
++tclsh84_found="$ac_cv_prog_tclsh84_found"
++if test -n "$tclsh84_found"; then
++  echo "$ac_t""$tclsh84_found" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
+ # Extract the first word of "tclsh8.3", so it can be a program name with args.
+ set dummy tclsh8.3; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -3085,7 +3115,9 @@
+   fi
+ fi
+ tclLibrary=''
+-if test $tclsh83_found = yes; then
++if test $tclsh84_found = yes; then
++  tclLibrary=`echo "puts [info library]" | tclsh8.4`
++elif test $tclsh83_found = yes; then
+   tclLibrary=`echo "puts [info library]" | tclsh8.3`
+ elif test $tclsh82_found = yes; then
+   tclLibrary=`echo "puts [info library]" | tclsh8.2`
+@@ -3195,7 +3227,7 @@
+         break
+       fi
+     else
+-      for version in 83 8.3 82 8.2 81 8.1 80 8.0 76 7.6 7.5 7.4 ''; do
++      for version in 84 8.4 83 8.3 82 8.2 81 8.1 80 8.0 76 7.6 7.5 7.4 ''; do
+         if test -r $expand_dir/libtcl${version}${suffix}; then
+           tcllibdir=$dir  
+           tcllibname=tcl$version
+@@ -3352,7 +3384,7 @@
+         break
+       fi
+     else
+-      for version in 83 8.3 82 8.2 81 8.1 80 8.0 42 4.2 4.1 4.0 ''; do
++      for version in 84 8.4 83 8.3 82 8.2 81 8.1 80 8.0 42 4.2 4.1 4.0 ''; do
+         if test -r $expand_dir/libtk${version}${suffix}; then
+           tklibdir=$dir
+           tklibname=tk${version}
+@@ -4108,7 +4140,7 @@
+ echo $ac_n "checking how to avoid implicit int return warning""... $ac_c" 1>&6
+ echo "configure:4110: checking how to avoid implicit int return warning" >&5
+ CFLAGS_NOWARN_IMPLICIT_INT=-Wno-implicit-int
+-CFLAGS="-Wall -Werror $CFLAGS_NOWARN_IMPLICIT_INT $CFLAGS"
++CFLAGS="-Wall $CFLAGS_NOWARN_IMPLICIT_INT $CFLAGS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4114 "configure"
+ #include "confdefs.h"
+@@ -4133,7 +4165,7 @@
+ echo $ac_n "checking how to avoid unknown pragma warning""... $ac_c" 1>&6
+ echo "configure:4135: checking how to avoid unknown pragma warning" >&5
+ CFLAGS_NOWARN_UNKNOWN_PRAGMAS=-Wno-unknown-pragmas
+-CFLAGS="-Wall -Werror $CFLAGS_NOWARN_UNKNOWN_PRAGMAS"
++CFLAGS="-Wall $CFLAGS_NOWARN_UNKNOWN_PRAGMAS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4139 "configure"
+ #include "confdefs.h"
+@@ -5049,6 +5081,7 @@
+       JAVAINCLUDES="$JAVAINCLUDES -I$jdkincludedir/freebsd"
+       threads=green
+       proc=i386
++      JAVACMD="\${jdkdir}/bin/java"
+     elif test -f $expand_jdkincludedir/irix/jni_md.h; then
+       JAVAINCLUDES="$JAVAINCLUDES -I$jdkincludedir/irix"
+       threads=green
diff --git a/devel/swarm/files/patch-makefile b/devel/swarm/files/patch-java::c::Makefile.in
index 8aeba973a1bd..9a1c47854fea 100644
--- a/devel/swarm/files/patch-makefile
+++ b/devel/swarm/files/patch-java::c::Makefile.in
@@ -1,11 +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
+--- java/c/Makefile.in.orig	Tue Nov  4 23:32:01 2003
++++ java/c/Makefile.in	Tue Nov  4 23:32:42 2003
 @@ -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)
++	$(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/.libs $(SWARMLIBS) -lobjc
  
  ENTRYCMD=-e @JAVASWARM_DLL_ENTRY@
  
diff --git a/devel/swarm/files/patch-libobjc::configure b/devel/swarm/files/patch-libobjc::configure
new file mode 100644
index 000000000000..45e59ef77a14
--- /dev/null
+++ b/devel/swarm/files/patch-libobjc::configure
@@ -0,0 +1,31 @@
+--- libobjc/configure.orig	Sun Mar 26 05:00:17 2000
++++ libobjc/configure	Tue Nov  4 14:30:57 2003
+@@ -1642,8 +1642,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1657,7 +1657,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -1670,7 +1670,7 @@
+ test -n "$OBJC" || OBJC="$CC"
+ 
+ test -n "$OBJCFLAGS" || OBJCFLAGS="$CFLAGS"
+-OBJCFLAGS="-Wall -Werror $OBJCFLAGS"
++OBJCFLAGS="-Wall $OBJCFLAGS"
+    
+ 
+ # Pass with no value to take the default
diff --git a/devel/swarm/files/patch-src::Makefile.in b/devel/swarm/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..1b85e85e442d
--- /dev/null
+++ b/devel/swarm/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Nov  4 23:30:16 2003
++++ src/Makefile.in	Tue Nov  4 23:31:27 2003
+@@ -213,7 +213,7 @@
+ 
+ LIBS = $(foreach module,$(SWARMMODULES),-l$(module)) -lobjc $(SYSLIBS)
+ 
+-libswarm_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(libdir) $(foreach module,$(SWARMMODULES),-L$(module)) -L../libobjc $(SUPPORTLDFLAGS) -L$(dir $(shell $(CC) -print-libgcc-file-name)) 
++libswarm_la_LDFLAGS = -version-info $(CURRENT):$(REVISION):$(AGE) -rpath $(libdir) $(foreach module,$(SWARMMODULES),-L$(module)/.libs) -L../libobjc $(SUPPORTLDFLAGS) -L$(dir $(shell $(CC) -print-libgcc-file-name)) 
+ 
+ DLLWRAP = @DLLWRAP@
+ @USEDLL_TRUE@OBJS = @USEDLL_TRUE@$(foreach module,$(SWARMMODULES),$(module)/*.lo)
diff --git a/devel/swarm/pkg-message b/devel/swarm/pkg-message
index 631d676f2b22..81c2078c0f93 100644
--- a/devel/swarm/pkg-message
+++ b/devel/swarm/pkg-message
@@ -7,4 +7,11 @@ ex:
   in bash:
 	export SWARMHOME=%%PREFIX%%
 
-Swarm samples can be found at ftp://ftp.swarm.org/pub/swarm/src/apps/objc/swarmapps-2.1.1.tar.gz
+and use gmake to build swarm examples.
+
+Swarm examples can be found at:
+   ftp://ftp.swarm.org/pub/swarm/apps/objc/sdg/swarmapps-2.1.1.tar.gz
+   ( Objective-C examples )
+   and
+   ftp://ftp.swarm.org/pub/swarm/apps/java/sdg/jheatbugs-2.1.tar.gz
+   ( java example )
diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist
index f591680c2bc8..13fdc0eb9b57 100644
--- a/devel/swarm/pkg-plist
+++ b/devel/swarm/pkg-plist
@@ -1,5 +1,5 @@
-%%JAVA%%bin/javaswarm
-%%JAVA%%bin/javacswarm
+bin/javacswarm
+bin/javaswarm
 bin/libtool-swarm
 bin/m2h
 bin/make-h2x
@@ -240,17 +240,16 @@ lib/swarm/libcollections.so.3
 lib/swarm/libdefobj.a
 lib/swarm/libdefobj.so
 lib/swarm/libdefobj.so.4
-%%JAVA%%lib/swarm/libjavaswarm.a
-%%JAVA%%lib/swarm/libjavaswarm.so
-%%JAVA%%lib/swarm/libjavaswarm.so.1
-%%JAVA%%lib/swarm/libjavaswarmstubs.a
-%%JAVA%%lib/swarm/libjavaswarmstubs.so
-%%JAVA%%lib/swarm/libjavaswarmstubs.so.0
+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.a
 lib/swarm/libmisc.so
 lib/swarm/libmisc.so.2
 lib/swarm/libobjc.a
-lib/swarm/libobjc.la
 lib/swarm/libobjc.so
 lib/swarm/libobjc.so.0
 lib/swarm/libobjectbase.a
@@ -277,8 +276,8 @@ lib/swarm/libtclobjc.so.1
 lib/swarm/libtkobjc.a
 lib/swarm/libtkobjc.so
 lib/swarm/libtkobjc.so.5
-%%JAVA%%share/swarm/swarm.jar
-%%JAVA%%@dirrm share/swarm
+share/swarm/swarm.jar
+@dirrm share/swarm
 @dirrm etc/swarm
 @dirrm include/swarm/activity
 @dirrm include/swarm/analysis