12 files changed, 23 insertions, 26 deletions

diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index 28b15fdf168b..9f732ed40ea2 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	echolinux
 PORTVERSION=	0.17a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 55d96af4228c..10f5f7865b23 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmastermind
 PORTVERSION=	0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/strategy
 
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index f7669110bea3..8107d7845bcf 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qslim
 PORTVERSION=	2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://mgarland.org/files/dist/ \
 		CENKES
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgfx.so:${PORTSDIR}/graphics/libgfx \
-		libforms.so:${PORTSDIR}/x11-toolkits/xforms
+		libgfx.so:${PORTSDIR}/graphics/libgfx
 
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
 BUILD_WRKSRC=		${WRKSRC}/mixkit/src
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 9c6e7100e70d..ee703b97ef87 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfpovray
 PORTVERSION=	1.3.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
 		${MASTER_SITE_SUNSITE}
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 4cc25e035e63..4689c8fb6c89 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apc
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	arved
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index b66fb64b377f..7fd56c62f535 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xldlas
 PORTVERSION=	0.85
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/visualization
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 1a7747287342..4b55e21b9f79 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xisp
 PORTVERSION=	2.7p4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://xisp.hellug.gr/release/
 
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index 6602fa693c3b..eee5bd67e919 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-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 96e63871dfa0..dda9a9ca5cc3 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -3,30 +3,28 @@
 
 PORTNAME=	xforms
 DISTVERSION=	1.2.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	A graphical user interface toolkit for X Window System
+COMMENT=	Graphical user interface toolkit for X Window System
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
+USES=		libtool
 USE_XORG=	xpm
 USE_GL=		gl
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64"
-BROKEN=		Does not compile on ia64
-.endif
+BROKEN_ia64=	Does not compile on ia64
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/xforms/pkg-plist b/x11-toolkits/xforms/pkg-plist
index 6b4539353e1f..c524d068dfb0 100644
--- a/x11-toolkits/xforms/pkg-plist
+++ b/x11-toolkits/xforms/pkg-plist
@@ -4,17 +4,17 @@ include/flimage.h
 include/forms.h
 include/glcanvas.h
 lib/libflimage.a
-lib/libflimage.la
 lib/libflimage.so
-lib/libflimage.so.3
+lib/libflimage.so.2
+lib/libflimage.so.2.1.3
 lib/libforms.a
-lib/libforms.la
 lib/libforms.so
-lib/libforms.so.3
+lib/libforms.so.2
+lib/libforms.so.2.1.3
 lib/libformsGL.a
-lib/libformsGL.la
 lib/libformsGL.so
-lib/libformsGL.so.3
+lib/libformsGL.so.2
+lib/libformsGL.so.2.1.3
 man/man1/fdesign.1.gz
 man/man1/fd2ps.1.gz
 man/man5/xforms.5.gz
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index 33e39cba6542..c601bf867aa4 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gpctool
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 math graphics
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
 DISTNAME=	gpct${PORTVERSION:S/.//g}
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index fe0389d22f8a..7ba4cc9c36b5 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tycoon
 PORTVERSION=	1.07o
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	SUNSITE/X11/desktop