Upgrade to 1.0.0. I tried to keep it buildable with both the new and the older C++

compiler, but no port seems to depend on this one, anyway.

5 files changed, 57 insertions, 24 deletions

diff --git a/devel/korelib/Makefile b/devel/korelib/Makefile
index 71bebef727f2..dc9cecfb0119 100644
--- a/devel/korelib/Makefile
+++ b/devel/korelib/Makefile
@@ -6,19 +6,24 @@
 #
 
 PORTNAME=	korelib
-PORTVERSION=	0.0.1
+PORTVERSION=	1.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.rygannon.com/pub/Korelib/releases/
+MASTER_SITES=	ftp://ftp.rygannon.com/pub/Korelib/
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_KDELIBS_VER=2
-USE_LIBTOOL=	yes
+USE_KDELIBS_VER=3
+USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
 pre-configure:
-	${PERL} -pi -e "s@-g -O2@${CFLAGS}@g; s@-O2@${CFLAGS}@g" \
+	${REINPLACE_CMD} -e "s@-g -O2@${CXXFLAGS}@g" -e "s@-O2@${CFLAGS}@g" \
 		${WRKSRC}/configure ${WRKSRC}/*/Makefile.in ${WRKSRC}/*/*/Makefile.in
 
+post-install:
+	${RM} -f ${PREFIX}/lib/libkore.la
+
 .include <bsd.port.mk>
diff --git a/devel/korelib/distinfo b/devel/korelib/distinfo
index 3a39fb93a8ac..92abaed44215 100644
--- a/devel/korelib/distinfo
+++ b/devel/korelib/distinfo
@@ -1 +1 @@
-MD5 (korelib-0.0.1.tar.gz) = b6a5b01f70933f13eb7b735f958fd598
+MD5 (korelib-1.0.tar.gz) = 0d94b67238d2f7c492af23fb35b34975
diff --git a/devel/korelib/files/patch-hash_map b/devel/korelib/files/patch-hash_map
new file mode 100644
index 000000000000..5a4ca72bc384
--- /dev/null
+++ b/devel/korelib/files/patch-hash_map
@@ -0,0 +1,27 @@
+--- include/kore/metainfo.h	Mon May 20 10:26:01 2002
++++ include/kore/metainfo.h	Wed Jul 24 19:24:03 2002
+@@ -9,3 +9,9 @@
+ #else
+-#include <hash_map>
++#	if defined(__GNUC__) && __GNUC__ > 2
++#		include <ext/hash_map>
++#		include <ext/stl_hash_fun.h>
++		using namespace __gnu_cxx;
++#	else
++#		include <hash_map>
++#	endif
+ #endif
+--- kore/metainfo.cpp	Mon May 20 10:26:01 2002
++++ kore/metainfo.cpp	Wed Jul 24 19:25:25 2002
+@@ -2,4 +2,3 @@
+ #include <vector>
+-#include <iostream.h>
+-#include <hash_map>
++#include <iostream>
+ using namespace kore;
+--- kore/componenttrader.cpp	Mon May 20 10:26:01 2002
++++ kore/componenttrader.cpp	Wed Jul 24 19:26:48 2002
+@@ -7,3 +7,2 @@
+ //#ifdef _WIN32
+-#include <hash_map>
+ #include <vector>
diff --git a/devel/korelib/files/patch-nodemo b/devel/korelib/files/patch-nodemo
new file mode 100644
index 000000000000..4266d8d597df
--- /dev/null
+++ b/devel/korelib/files/patch-nodemo
@@ -0,0 +1,7 @@
+--- Makefile.am	Mon May 20 10:26:01 2002
++++ Makefile.am	Wed Jul 24 19:42:33 2002
+@@ -2,3 +2,3 @@
+ #SUBDIRS = include kore demo samples 
+-SUBDIRS = include kore demo
++SUBDIRS = include kore
+ AUTOMAKE_OPTIONS = foreign
diff --git a/devel/korelib/pkg-plist b/devel/korelib/pkg-plist
index 3d1da217c5a3..ab70399fadd8 100644
--- a/devel/korelib/pkg-plist
+++ b/devel/korelib/pkg-plist
@@ -1,22 +1,16 @@
-bin/demo
-bin/koredlg
-include/kore/kernel.h
+include/kore/componentproxy.h
+include/kore/componentref.h
+include/kore/componenttrader.h
+include/kore/interface.h
 include/kore/kore.h
-include/kore/module.h
-include/kore/modulemanager.h
-include/kore/plugin.h
-include/kore/pluginloader.h
-include/kore/pluginmanager.h
-include/kore/servicemanager.h
-include/kore/serviceprovider.h
-include/kore/version.h
+include/kore/library.h
+include/kore/libraryloader.h
+include/kore/librarylocator.h
+include/kore/metainfo.h
+include/kore/robackend.h
+include/kore/rwbackend.h
+include/kore/wrbackend.h
 lib/libkore.a
 lib/libkore.so
-lib/libkore.so.0
-lib/libkoredlg_cout.a
-lib/libkoredlg_cout.so
-lib/libkoredlg_cout.so.0
-lib/libkoretest.a
-lib/libkoretest.so
-lib/libkoretest.so.0
+lib/libkore.so.8
 @dirrm include/kore