8 files changed, 105 insertions, 17 deletions

diff --git a/devel/jakelib2/Makefile b/devel/jakelib2/Makefile
index 8cf2833441bd..c0ecba537308 100644
--- a/devel/jakelib2/Makefile
+++ b/devel/jakelib2/Makefile
@@ -1,5 +1,5 @@
 # ex:ts=8
-# Ports collection makefile for:	jakelib2
+# New ports collection makefile for:	jakelib2
 # Date created:			Oct 23, 2003
 # Whom:				ijliao
 #
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	jakelib2
-PORTVERSION=	2.0.0.s
-PORTREVISION=	1
+PORTVERSION=	2.0.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.jakelib.org/lib/jakelib2/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A cross platform C++ class library with a Java-like API
@@ -25,15 +23,15 @@ CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--disable-debug
 
 USE_LDCONFIG=	yes
-INFO=	jakelib2
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
+INFO=		jakelib2
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+	@${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 0af97ac10d41..bc77bc24320f 100644
--- a/devel/jakelib2/distinfo
+++ b/devel/jakelib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakelib2-2.0.0s.tar.gz) = a58c044cac537cc45a1843b8a8eea227
-SHA256 (jakelib2-2.0.0s.tar.gz) = 04a67ee5a46ea3add755c6515e136e43705b0b796f48bbe735ab4820f227e1ac
-SIZE (jakelib2-2.0.0s.tar.gz) = 862042
+MD5 (jakelib2-2.0.2.tar.gz) = 5830a8eacb08ec3050fae1f3b38a4efe
+SHA256 (jakelib2-2.0.2.tar.gz) = 30e9b397fa25e1e47c8635a451115cdfef57ba728712b5fa864e7292017ae748
+SIZE (jakelib2-2.0.2.tar.gz) = 967121
diff --git a/devel/jakelib2/files/patch-Makefile.in b/devel/jakelib2/files/patch-Makefile.in
new file mode 100644
index 000000000000..836656ccd6ef
--- /dev/null
+++ b/devel/jakelib2/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- 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_Makefile.in b/devel/jakelib2/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..0b6977c7dd27
--- /dev/null
+++ b/devel/jakelib2/files/patch-src_Makefile.in
@@ -0,0 +1,16 @@
+--- 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_lang_System.cpp b/devel/jakelib2/files/patch-src_lang_System.cpp
new file mode 100644
index 000000000000..a55df8ef92bc
--- /dev/null
+++ b/devel/jakelib2/files/patch-src_lang_System.cpp
@@ -0,0 +1,16 @@
+--- 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 @@
+     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[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));
++  }
+ 
+   struct utsname un;
+   if (uname(&un) >= 0) {
diff --git a/devel/jakelib2/files/patch-src_net_Makefile.in b/devel/jakelib2/files/patch-src_net_Makefile.in
new file mode 100644
index 000000000000..aab66067ee57
--- /dev/null
+++ b/devel/jakelib2/files/patch-src_net_Makefile.in
@@ -0,0 +1,16 @@
+--- 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
new file mode 100644
index 000000000000..796b41005b77
--- /dev/null
+++ b/devel/jakelib2/files/patch-src_test_Makefile.in
@@ -0,0 +1,17 @@
+--- 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 8a9369b6d200..606d180fa459 100644
--- a/devel/jakelib2/pkg-plist
+++ b/devel/jakelib2/pkg-plist
@@ -12,6 +12,7 @@ include/jakelib2/io/BufferedReader.h
 include/jakelib2/io/BufferedWriter.h
 include/jakelib2/io/ByteArrayInputStream.h
 include/jakelib2/io/File.h
+include/jakelib2/io/FileInfo.h
 include/jakelib2/io/FileInputStream.h
 include/jakelib2/io/FileOutputStream.h
 include/jakelib2/io/FileReader.h