8 files changed, 24 insertions, 105 deletions

diff --git a/devel/jakelib2/Makefile b/devel/jakelib2/Makefile
index 182b203b8430..505baf91201b 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	jakelib2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.donuz.de/lib/jakelib2/download/
+MASTER_SITES=	http://www.donuz.de/download/${PORTNAME}/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A cross platform C++ class library with a Java-like API
@@ -25,15 +25,8 @@ CONFIGURE_ARGS=	--disable-debug
 USE_LDCONFIG=	yes
 INFO=		jakelib2
 
-PORTSCOUT=	limit:2.0.3
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/configure
-# Fixes for GCC 4.2
-	@${REINPLACE_CMD} -e '178s|gc::||' \
-		${WRKSRC}/include/jakelib2/gc/gc_cpp.h
-	@${REINPLACE_CMD} -e 's|SimpleDateFormat::||' \
-		${WRKSRC}/include/jakelib2/text/SimpleDateFormat.h
 
 .include <bsd.port.mk>
diff --git a/devel/jakelib2/distinfo b/devel/jakelib2/distinfo
index bc77bc24320f..5f0c9a33ecbf 100644
--- a/devel/jakelib2/distinfo
+++ b/devel/jakelib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakelib2-2.0.2.tar.gz) = 5830a8eacb08ec3050fae1f3b38a4efe
-SHA256 (jakelib2-2.0.2.tar.gz) = 30e9b397fa25e1e47c8635a451115cdfef57ba728712b5fa864e7292017ae748
-SIZE (jakelib2-2.0.2.tar.gz) = 967121
+MD5 (jakelib2-2.0.3.tar.gz) = bb9f98fd8d3dcf60679d66946b0bae12
+SHA256 (jakelib2-2.0.3.tar.gz) = 42d6d617624330058dbb44d32a9252270827470b6e4bfd559d26ddfec71e3b47
+SIZE (jakelib2-2.0.3.tar.gz) = 941359
diff --git a/devel/jakelib2/files/patch-Makefile.in b/devel/jakelib2/files/patch-Makefile.in
deleted file mode 100644
index 836656ccd6ef..000000000000
--- a/devel/jakelib2/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Sun Feb 19 14:59:32 2006
-+++ Makefile.in	Thu Jul  5 00:52:41 2007
-@@ -184,21 +184,6 @@
- DIST_SUBDIRS = $(SUBDIRS)
- all: all-recursive
- 
--.SUFFIXES:
--
--am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
--
--$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
--
- $(ACLOCAL_M4):  configure.in acinclude.m4
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- jakelib2-config: $(top_builddir)/config.status jakelib2-config.in
diff --git a/devel/jakelib2/files/patch-src_lang_System.cpp b/devel/jakelib2/files/patch-src-lang_System.cpp
index a55df8ef92bc..e984333c1cb3 100644
--- a/devel/jakelib2/files/patch-src_lang_System.cpp
+++ b/devel/jakelib2/files/patch-src-lang_System.cpp
@@ -1,15 +1,19 @@
---- src/lang/System.cpp.orig	Sun Feb 19 15:01:10 2006
-+++ src/lang/System.cpp	Thu Jul  5 01:53:34 2007
-@@ -373,10 +373,11 @@
+--- src/lang/System.cpp.orig	2010-03-10 11:40:35.000000000 +0100
++++ src/lang/System.cpp	2010-03-10 11:41:21.000000000 +0100
+@@ -373,13 +373,10 @@
      properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[15], new jakelib::lang::String(chars_jakelib2_str_15, 0, 8)), JAKELIB_ONDEMAND(jakelib2_strings[16], new jakelib::lang::String(chars_jakelib2_str_16, 0, 0)) ->plus( cwd));
  
    struct passwd *pw = getpwuid(getuid());
 -  if (pw != null)
-+  if (pw != null) {
-     properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[17], new jakelib::lang::String(chars_jakelib2_str_17, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[18], new jakelib::lang::String(chars_jakelib2_str_18, 0, 0)) ->plus( pw->pw_dir));
- 
+-    properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[17], new jakelib::lang::String(chars_jakelib2_str_17, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[18], new jakelib::lang::String(chars_jakelib2_str_18, 0, 0)) ->plus( pw->pw_dir));
+-
+-  // TODO: cuserid auf dem Mac!
+-#if !defined(MACOSX)
 -  properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[19], new jakelib::lang::String(chars_jakelib2_str_19, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[20], new jakelib::lang::String(chars_jakelib2_str_20, 0, 0)) ->plus( cuserid(null)));
-+    properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[19], new jakelib::lang::String(chars_jakelib2_str_19, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[20], new jakelib::lang::String(chars_jakelib2_str_20, 0, 0)) ->plus( pw->pw_name));
+-#endif
++  if (pw != null) {
++      properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[17], new jakelib::lang::String(chars_jakelib2_str_17, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[18], new jakelib::lang::String(chars_jakelib2_str_18, 0, 0)) ->plus( pw->pw_dir));
++      properties->setProperty(JAKELIB_ONDEMAND(jakelib2_strings[19], new jakelib::lang::String(chars_jakelib2_str_19, 0, 9)), JAKELIB_ONDEMAND(jakelib2_strings[20], new jakelib::lang::String(chars_jakelib2_str_20, 0, 0)) ->plus( pw->pw_name));
 +  }
  
    struct utsname un;
diff --git a/devel/jakelib2/files/patch-src_Makefile.in b/devel/jakelib2/files/patch-src_Makefile.in
deleted file mode 100644
index 0b6977c7dd27..000000000000
--- a/devel/jakelib2/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	Sun Feb 19 15:01:03 2006
-+++ src/Makefile.in	Thu Jul  5 00:52:24 2007
-@@ -554,13 +554,6 @@
- 
- all: all-recursive
- 
--.SUFFIXES:
--.SUFFIXES: .c .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
diff --git a/devel/jakelib2/files/patch-src_net_Makefile.in b/devel/jakelib2/files/patch-src_net_Makefile.in
deleted file mode 100644
index aab66067ee57..000000000000
--- a/devel/jakelib2/files/patch-src_net_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/net/Makefile.in.orig	Sun Feb 19 15:01:40 2006
-+++ src/net/Makefile.in	Thu Jul  5 00:53:03 2007
-@@ -168,13 +168,6 @@
- DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- all: all-am
- 
--.SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/net/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
diff --git a/devel/jakelib2/files/patch-src_test_Makefile.in b/devel/jakelib2/files/patch-src_test_Makefile.in
deleted file mode 100644
index 796b41005b77..000000000000
--- a/devel/jakelib2/files/patch-src_test_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/test/Makefile.in.orig	Sun Feb 19 15:03:19 2006
-+++ src/test/Makefile.in	Thu Jul  5 01:38:26 2007
-@@ -242,14 +242,6 @@
- 
- all: all-am
- 
--.SUFFIXES:
--.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  src/test/Makefile
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--
- clean-noinstLIBRARIES:
- 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
- libjake2_test.a: $(libjake2_test_a_OBJECTS) $(libjake2_test_a_DEPENDENCIES) 
diff --git a/devel/jakelib2/pkg-plist b/devel/jakelib2/pkg-plist
index 606d180fa459..cb06d1e8908f 100644
--- a/devel/jakelib2/pkg-plist
+++ b/devel/jakelib2/pkg-plist
@@ -4,10 +4,6 @@ bin/jakelib2-skeleton
 bin/jlpp
 include/jakelib2.h
 include/jakelib2/config.h
-include/jakelib2/gc/gc.h
-include/jakelib2/gc/gc_config_macros.h
-include/jakelib2/gc/gc_cpp.h
-include/jakelib2/gc/gc_pthread_redirects.h
 include/jakelib2/io/BufferedReader.h
 include/jakelib2/io/BufferedWriter.h
 include/jakelib2/io/ByteArrayInputStream.h
@@ -173,7 +169,14 @@ include/jakelib2/util/regex/Pattern.h
 include/jakelib2/util/regex/PatternSyntaxException.h
 include/jakelib2/util/regex/pcre.h
 include/jakelib2/win32config.h
-@dirrm include/jakelib2/gc
+lib/libjake2.a
+lib/libjake2.la
+lib/libjake2.so
+lib/libjake2.so.2
+share/aclocal/jakelib2.m4
+%%DATADIR%%/template/COPYING
+%%DATADIR%%/template/Main.jlc
+%%DATADIR%%/template/Sub.jlc
 @dirrm include/jakelib2/io
 @dirrm include/jakelib2/lang
 @dirrm include/jakelib2/net
@@ -182,13 +185,5 @@ include/jakelib2/win32config.h
 @dirrm include/jakelib2/util/regex
 @dirrm include/jakelib2/util
 @dirrm include/jakelib2
-lib/libjake2.a
-lib/libjake2.la
-lib/libjake2.so
-lib/libjake2.so.1
-share/aclocal/jakelib2.m4
-%%DATADIR%%/template/COPYING
-%%DATADIR%%/template/Main.jlc
-%%DATADIR%%/template/Sub.jlc
 @dirrm %%DATADIR%%/template
 @dirrm %%DATADIR%%