9 files changed, 25 insertions, 33 deletions

diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 4b544dcd37bf..cf642892b161 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   eris
-# Date created:        3 February 2005
-# Whom:                Janni
-#
+# Created by: Janni
 # $FreeBSD$
-#
 
 PORTNAME=	eris
-PORTVERSION=	1.3.19
+PORTVERSION=	1.3.21
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/
 
@@ -14,10 +10,10 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
 LIB_DEPENDS=	Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
-		skstream-0.3.6:${PORTSDIR}/net/skstream \
-		wfmath-0.3.5:${PORTSDIR}/math/wfmath \
+		skstream-0.3.7:${PORTSDIR}/net/skstream \
+		wfmath-1.0.1:${PORTSDIR}/math/wfmath \
 		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-		mercator-0.3.1:${PORTSDIR}/devel/mercator
+		mercator-0.3.3:${PORTSDIR}/devel/mercator
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/eris/distinfo b/devel/eris/distinfo
index 0f35a8ba1370..0d6e37f5ccdd 100644
--- a/devel/eris/distinfo
+++ b/devel/eris/distinfo
@@ -1,2 +1,2 @@
-SHA256 (eris-1.3.19.tar.gz) = 203c71f5bcf397846c2bb1e63ee5c165aea4dc60f2debe76e9f2f0e3c34d9554
-SIZE (eris-1.3.19.tar.gz) = 588311
+SHA256 (eris-1.3.21.tar.gz) = 9e20cd008f6a28e2067ea1d26c1bf4860f2906d4e023ac0f57b73b85cff390e9
+SIZE (eris-1.3.21.tar.gz) = 618053
diff --git a/devel/eris/pkg-plist b/devel/eris/pkg-plist
index 4e9894804088..eb7705c2ffd9 100644
--- a/devel/eris/pkg-plist
+++ b/devel/eris/pkg-plist
@@ -1,6 +1,6 @@
 lib/liberis-1.3.la
 lib/liberis-1.3.so
-lib/liberis-1.3.so.19
+lib/liberis-1.3.so.20
 include/Eris-1.3/Eris/Account.h
 include/Eris-1.3/Eris/Alarm.h
 include/Eris-1.3/Eris/Avatar.h
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index d45221e42d31..d3ca04fbd409 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -1,21 +1,18 @@
-# New ports collection makefile for:   mercator
-# Date created:        4 February 2005
-# Whom:                Janni
-#
+# Created by: Janni
 # $FreeBSD$
-#
 
 PORTNAME=	mercator
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.2
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A procedural terrain library
 
-LIB_DEPENDS=	wfmath-0.3.5:${PORTSDIR}/math/wfmath
+LIB_DEPENDS=	wfmath-1.0.1:${PORTSDIR}/math/wfmath
 
-USE_GNOME=	pkgconfig gnomehack
+USE_GNOME=	gnomehack
+USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/mercator/distinfo b/devel/mercator/distinfo
index bbed981ce45f..1f4fe52774eb 100644
--- a/devel/mercator/distinfo
+++ b/devel/mercator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercator-0.3.0.tar.gz) = 6b12acda4e86fad0987fcd4ec18b79faa01605ef5ef71b7d8261691d3f8835e9
-SIZE (mercator-0.3.0.tar.gz) = 410127
+SHA256 (mercator-0.3.2.tar.gz) = 5388299694545b266d0c232fc7124ec52d88fef69159b0acd38919fd1095fcc1
+SIZE (mercator-0.3.2.tar.gz) = 432442
diff --git a/devel/mercator/pkg-plist b/devel/mercator/pkg-plist
index 6d2af627eb98..bcdf59ce23bc 100644
--- a/devel/mercator/pkg-plist
+++ b/devel/mercator/pkg-plist
@@ -1,6 +1,6 @@
 lib/libmercator-0.3.la
 lib/libmercator-0.3.so
-lib/libmercator-0.3.so.1
+lib/libmercator-0.3.so.3
 include/Mercator-0.3/Mercator/Effector.h
 include/Mercator-0.3/Mercator/Mercator.h
 include/Mercator-0.3/Mercator/Matrix.h
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 3fbb2a86c890..447bc765bad8 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	varconf
-# Date created:				29 March 2001
-# Whom:					Oliver Lehmann <lehmann@ans-netz.de>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	varconf
-PORTVERSION=	0.6.7
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
 
@@ -20,11 +16,13 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in README COPYING AUTHORS THANKS NEWS
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/devel/varconf/distinfo b/devel/varconf/distinfo
index f177e0f6755e..2305908d51e9 100644
--- a/devel/varconf/distinfo
+++ b/devel/varconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varconf-0.6.7.tar.bz2) = b22dfe8b4f2ec081060545fa4b6c28b78c4b702b0621cc0eea1651bbd9fb0095
-SIZE (varconf-0.6.7.tar.bz2) = 272485
+SHA256 (varconf-1.0.0.tar.bz2) = 91f9e909e1df6bbfef2fb3d589e1fd370e90c2310813cb445f1ee4b9cabffcc5
+SIZE (varconf-1.0.0.tar.bz2) = 301905
diff --git a/devel/varconf/pkg-plist b/devel/varconf/pkg-plist
index 461eb636de40..6ed75dfd60b7 100644
--- a/devel/varconf/pkg-plist
+++ b/devel/varconf/pkg-plist
@@ -5,10 +5,11 @@ include/varconf-1.0/varconf/dyntypes.h
 include/varconf-1.0/varconf/dynvar.h
 include/varconf-1.0/varconf/parse_error.h
 include/varconf-1.0/varconf/varconf.h
+include/varconf-1.0/varconf/varconf_defs.h
 include/varconf-1.0/varconf/variable.h
 lib/libvarconf-1.0.la
 lib/libvarconf-1.0.so
-lib/libvarconf-1.0.so.7
+lib/libvarconf-1.0.so.8
 libdata/pkgconfig/varconf-1.0.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING