- Chase x11-toolkits/xforms shlib bump

- Bump PORTREVISION
- STAGE-clean here and there

13 files changed, 28 insertions, 31 deletions

diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index bbdb20b..28b15fd 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	echolinux
 PORTVERSION=	0.17a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index bb87fde..55d96af 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmastermind
 PORTVERSION=	0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy
 
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index 2dd16b0..43b4660 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qslim
 PORTVERSION=	2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://mgarland.org/files/dist/ \
 		CENKES
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 0bf146f..9c6e710 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfpovray
 PORTVERSION=	1.3.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
 		${MASTER_SITE_SUNSITE}
@@ -13,15 +13,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface to POV-Ray
 
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray-meta
 
 USES=		imake
 USE_XORG=	x11 xext xpm
-USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h
 
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index fa5528a..ac5c17b 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfmail
 PORTVERSION=	1.5.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/	\
 		ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/	\
@@ -13,13 +13,14 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}/source/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X Window System application for receiving electronic mail
 
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms \
-		gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms \
+		libgdbm.so:${PORTSDIR}/databases/gdbm
 
+USES=		gmake
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
+USE_GCC=	yes
 USE_GNOME=	glib12
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 8d4d7a2..fe02459 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apc
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	arved
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xforms based Auto Payment Calculator
 
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 
 USE_XORG=	x11 xpm
 MAN1=		apc.1
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 7a0607e..b66fb64 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -3,26 +3,23 @@
 
 PORTNAME=	xldlas
 PORTVERSION=	0.85
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/visualization
 EXTRACT_SUFX=	-source.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An XForms-based statistics package
+COMMENT=	XForms-based statistics package
 
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 
 WRKSRC=		${WRKDIR}/xldlas
 
-MAN1=	xldlas.1
-
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xldlas.1 ${PREFIX}/man/man1
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/help ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xldlas.1 ${STAGEDIR}${PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${CP} -R ${WRKSRC}/help ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/math/xldlas/pkg-plist b/math/xldlas/pkg-plist
index c849848..ddb2174 100644
--- a/math/xldlas/pkg-plist
+++ b/math/xldlas/pkg-plist
@@ -1,4 +1,5 @@
 bin/xldlas
+man/man1/xldlas.1.gz
 %%DATADIR%%/help/analysis.help
 %%DATADIR%%/help/data.help
 %%DATADIR%%/help/file.help
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index cb3208f..3fdd270 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xisp
 PORTVERSION=	2.7p4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://xisp.hellug.gr/release/
 
@@ -12,7 +12,7 @@ PATCH_SITES=	http://www.ml-search.com/xisp/distfiles/
 MAINTAINER=	tm@onepost.net
 COMMENT=	A user-friendly X interface to pppd/chat
 
-LIB_DEPENDS=	forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
 
 USE_XORG=	xpm
 
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index 45512a3..aff788c 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-xforms
 
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index f04a6bb..402c5ae 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gpctool
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 math graphics
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
 DISTNAME=	gpct${PORTVERSION:S/.//g}
@@ -11,8 +11,8 @@ DISTNAME=	gpct${PORTVERSION:S/.//g}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Evaluation tool for the Generic Polygon Clipper library
 
-LIB_DEPENDS=	gpc:${PORTSDIR}/devel/libgpc	\
-		formsGL.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libgpc.so:${PORTSDIR}/devel/libgpc	\
+		libformsGL.so:${PORTSDIR}/x11-toolkits/xforms
 
 USE_ZIP=	yes
 USE_GL=		yes
diff --git a/x11/gpctool/files/BSDmakefile b/x11/gpctool/files/BSDmakefile
index 9578622..ada4d80 100644
--- a/x11/gpctool/files/BSDmakefile
+++ b/x11/gpctool/files/BSDmakefile
@@ -8,7 +8,7 @@ BINDIR=		${PREFIX}/bin
 WARNS?=		2
 CFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lformsGL -lGLU
+LDFLAGS+=	-L${LOCALBASE}/lib -lforms -lformsGL -lGL -lGLU
 LDFLAGS+=	-L${LOCALBASE}/lib -lgpc -lm
 
 .include <bsd.prog.mk>
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 6c29449..fe0389d 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tycoon
 PORTVERSION=	1.07o
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	SUNSITE/X11/desktop