4 files changed, 40 insertions, 17 deletions

diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 206684b67cf4..0f56310d01a4 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -8,23 +8,26 @@
 
 PORTNAME=	serveez
 PORTVERSION=	0.1.3
+PORTREVISOIN=	1
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt \
-		bz2:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		guile.10:${PORTSDIR}/lang/guile
+.if !exists(/usr/bin/bzip2)
+LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
+.endif
 
 GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	\
-	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include `${GUILE_CONFIG} compile`" \
-	LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt `${GUILE_CONFIG} link`"
+
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `${GUILE_CONFIG} compile`" \
+		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt `${GUILE_CONFIG} link`"
 INSTALLS_SHLIB=	yes
 
 MAN1=	serveez.1
diff --git a/net/serveez/files/patch-Makefile.in b/net/serveez/files/patch-Makefile.in
new file mode 100644
index 000000000000..3c63c6a54bb7
--- /dev/null
+++ b/net/serveez/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Feb 17 01:23:50 2002
++++ Makefile.in	Sat Aug  3 00:05:59 2002
+@@ -130,7 +130,7 @@
+ WINDRES = @WINDRES@
+ resource_FILES = @resource_FILES@
+ 
+-SUBDIRS = src data test doc
++SUBDIRS = src data doc
+ 
+ EXTRA_DIST = BUGS autogen.sh README-alpha THANKS README-Win32 README-cross 	serveez.dsw config.h.serveez version.h.serveez 	RELEASE vcgen.bat autodsp serveez.ap
+ 
diff --git a/net/serveez/files/patch-configure b/net/serveez/files/patch-configure
new file mode 100644
index 000000000000..c2077be89ff1
--- /dev/null
+++ b/net/serveez/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Feb 17 01:21:39 2002
++++ configure	Sat Aug  3 00:04:37 2002
+@@ -7076,6 +7076,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/serveez/pkg-plist b/net/serveez/pkg-plist
index 1fbc5513079c..73bfa5d87bea 100644
--- a/net/serveez/pkg-plist
+++ b/net/serveez/pkg-plist
@@ -31,19 +31,15 @@ include/libserveez/util.h
 include/libserveez/vector.h
 include/libserveez/windoze.h
 include/svzconfig.h
-@dirrm include/libserveez/codec
-@dirrm include/libserveez/coserver
-@dirrm include/libserveez
-lib/libserveez-0.1.3.so
-lib/libserveez.a
-lib/libserveez.la
-lib/libserveez.so
 @unexec install-info --delete %D/info/serveez-api.info %D/info/dir
-@unexec install-info --delete %D/info/serveez.info %D/info/dir
 info/serveez-api.info
-info/serveez.info
 @exec install-info %D/info/serveez-api.info %D/info/dir
+@unexec install-info --delete %D/info/serveez.info %D/info/dir
+info/serveez.info
 @exec install-info %D/info/serveez.info %D/info/dir
+lib/libserveez.a
+lib/libserveez.so
+lib/libserveez.so.0
 share/aclocal/serveez.m4
 share/serveez/echo-server.scm
 share/serveez/eval-server.scm
@@ -53,3 +49,6 @@ share/serveez/mandel-server.scm
 share/serveez/mandel-shared.scm
 share/serveez/serveez.scm
 @dirrm share/serveez
+@dirrm include/libserveez/coserver
+@dirrm include/libserveez/codec
+@dirrm include/libserveez