idevel/swarm - undefined reference in libobjc.so

	- make port regarding libobj.so (see PR)
	- make port BROKEN regarding graphics/hdf5
	- unbreak port regarding missing "'s (see BENTO)

PR:		ports/51484
Submitted by:	Horance Chou <horance@freedom.ie.cycu.edu.tw>

4 files changed, 36 insertions, 21 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 1419ee5094a..d807d93648a 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swarm
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.santafe.edu/pub/swarm/src/swarm/
 
@@ -18,6 +19,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		BLT24.2:${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
 
 .if defined(WITH_JAVA)
@@ -52,11 +55,6 @@ pre-everything::
 	@${ECHO_MSG} "===> To enable java support , please define WITH_JAVA"
 	@${ECHO_MSG} "===>"
 .endif
-.if !defined(WITH_HDF5)
-	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> To enable HDF5 support, please define WITH_HDF5"
-	@${ECHO_MSG} "===>"
-.endif
 
 post-patch:
 
diff --git a/devel/swarm/files/patch-makefile b/devel/swarm/files/patch-makefile
index 0d569b430c7..8aeba973a1b 100644
--- a/devel/swarm/files/patch-makefile
+++ b/devel/swarm/files/patch-makefile
@@ -1,16 +1,11 @@
-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@
-+ 
-
+--- 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-src::random::C2LCGXgen.m b/devel/swarm/files/patch-src::random::C2LCGXgen.m
new file mode 100644
index 00000000000..b0d0bc3aeee
--- /dev/null
+++ b/devel/swarm/files/patch-src::random::C2LCGXgen.m
@@ -0,0 +1,11 @@
+--- ./src/random/C2LCGXgen.m.orig	Fri Oct 10 05:19:01 2003
++++ ./src/random/C2LCGXgen.m	Fri Oct 10 05:19:10 2003
+@@ -152,7 +152,7 @@
+   
+   if ((A > maxGen) || (v > 60) || (w > 60))
+     {
+-      printf("Generator parameters: A = %d  v = %d  w = %d
++      printf("Generator parameters: A = %d  v = %d  w = %d \
+ maxA = %lu  maxv = 60  maxw = 60\n\n", 
+              A,v,w,maxGen);
+     [InvalidCombination
diff --git a/devel/swarm/files/patch-src::tkobjc::Makefile.in b/devel/swarm/files/patch-src::tkobjc::Makefile.in
new file mode 100644
index 00000000000..6260700c94c
--- /dev/null
+++ b/devel/swarm/files/patch-src::tkobjc::Makefile.in
@@ -0,0 +1,11 @@
+--- src/tkobjc/Makefile.in.orig	Mon Apr 10 15:28:04 2000
++++ src/tkobjc/Makefile.in	Fri Oct 10 06:06:05 2003
+@@ -1270,7 +1270,7 @@
+ @CONSERVATIVE_OPTIMIZATION_TRUE@	$(OBJCCOMPILE) -O0 -c -o $@ $<
+ 
+ %_tcl.x: %.tcl
+-	(echo 'const char *$(notdir $(basename $<))_tcl = "' ; cat $< | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' ; echo '";' ) > $@ 
++	(echo 'const char *$(notdir $(basename $<))_tcl = "\\' ; cat $< | sed -e 's/\\/\\\\/g' -e 's/"/\\"\\\\/g' -e 's/$$/\\n\\/' ; echo '";' ) > $@ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.