5 files changed, 18 insertions, 39 deletions

diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index a3207eeb93f9..68a386d8546a 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -7,31 +7,31 @@
 #
 
 PORTNAME=	serveez
-PORTVERSION=	0.1.5
-PORTREVISION=	7
+PORTVERSION=	0.1.7
 CATEGORIES=	net devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A server framework
 
-LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-GUILE_CONFIG?=	${LOCALBASE}/bin/guile-config
+LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
-USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool
+CONFIGURE_ARGS=	--with-guile=${LOCALBASE}
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-MAN1=	serveez.1 serveez-config.1
-INFO=	serveez serveez-api
-
-CPPFLAGS+=	`${GUILE_CONFIG} compile`
-LDFLAGS+=	`${GUILE_CONFIG} link`
+MAN1=		serveez.1 serveez-config.1
+INFO=		serveez serveez-api
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-release||g' \
-		${WRKSRC}/src/libserveez/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|test||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's| -release .*||' ${WRKSRC}/src/libserveez/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net/serveez/distinfo b/net/serveez/distinfo
index ecd69fec49ba..9dd3328a38b4 100644
--- a/net/serveez/distinfo
+++ b/net/serveez/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serveez-0.1.5.tar.gz) = 4c643b751e8cd48ba0d11f73d54a93d01cb8effb27e98031f34cbdc29da541c0
-SIZE (serveez-0.1.5.tar.gz) = 896866
+SHA256 (serveez-0.1.7.tar.gz) = 7272b29c731790160d2b3174be1529bc145f7d5557554e4add01e5820750c694
+SIZE (serveez-0.1.7.tar.gz) = 896966
diff --git a/net/serveez/files/patch-Makefile.in b/net/serveez/files/patch-Makefile.in
deleted file mode 100644
index 3c63c6a54bb7..000000000000
--- a/net/serveez/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index c2077be89ff1..000000000000
--- a/net/serveez/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 4c8cd688b90e..86796ad40d72 100644
--- a/net/serveez/pkg-plist
+++ b/net/serveez/pkg-plist
@@ -34,9 +34,6 @@ include/libserveez/util.h
 include/libserveez/vector.h
 include/libserveez/windoze.h
 include/svzconfig.h
-@dirrm include/libserveez/coserver
-@dirrm include/libserveez/codec
-@dirrm include/libserveez
 lib/libserveez.a
 lib/libserveez.la
 lib/libserveez.so
@@ -52,3 +49,6 @@ share/aclocal/serveez.m4
 %%DATADIR%%/serveez-procedures.txt
 %%DATADIR%%/serveez.scm
 @dirrm %%DATADIR%%
+@dirrm include/libserveez/coserver
+@dirrm include/libserveez/codec
+@dirrm include/libserveez