7 files changed, 35 insertions, 120 deletions

diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index e29aa9db716f..5279f19a9cfa 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -6,54 +6,44 @@
 #
 
 PORTNAME=	xforms
-PORTVERSION=	1.0
-PORTREVISION=	6
+DISTVERSION=	1.0.93sp1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits graphics
-MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTNAME}/stable.pkg/${PORTVERSION}/:savannah \
-			mikeh/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A graphical user interface toolkit for X Window System
+MAINTAINER=	gahr@FreeBSD.org
+COMMENT=	A graphical user interface toolkit for X Window System
+
+LICENSE=	LGPL21
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_XORG=	xpm
 USE_GL=		gl
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		fdesign.1 fd2ps.1
+MAN5=		xforms.5
 
-.if defined(WITH_I18N)
-PKGNAMESUFFIX=	-i18n
-PATCH_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/ \
-		http://www.otaru-uc.ac.jp/~yokota/comp/
-PATCHFILES=	xforms-1.0-i18n_7.patch
-PATCH_DIST_STRIP=	-p1
-.endif
-
-REINPLACE_ARGS=	-i ""
-
-post-patch:
-	${REINPLACE_CMD} -e 's|-O4||' ${WRKSRC}/Imakefile
-.if defined(LOCALBASE)
-.	if ${LOCALBASE} != "/usr/X11R6"
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/image/rgb_db.c
-.	endif
-.endif
+#
+# This patchset does not apply to this version
+#
+#.if defined(WITH_I18N)
+#PKGNAMESUFFIX=	-i18n
+#PATCH_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/ \
+#		http://www.otaru-uc.ac.jp/~yokota/comp/
+#PATCHFILES=	xforms-1.0-i18n_7.patch
+#PATCH_DIST_STRIP=	-p1
+#.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900000
-BROKEN=	does not build
-.endif
-
 .if ${ARCH} == "ia64"
 BROKEN=		Does not compile on ia64
 .endif
diff --git a/x11-toolkits/xforms/distinfo b/x11-toolkits/xforms/distinfo
index bb888b73b478..560ad8554a0f 100644
--- a/x11-toolkits/xforms/distinfo
+++ b/x11-toolkits/xforms/distinfo
@@ -1,4 +1,4 @@
-SHA256 (xforms-1.0.tar.gz) = 541056624fd42895bdb9df04e64f2936f8950589673d05761ce9bd3f3c0fc485
-SIZE (xforms-1.0.tar.gz) = 1012878
+SHA256 (xforms-1.0.93sp1.tar.gz) = 0cbef8c16c478b7fc87cf24be618114f9b7d14dc0a06b61a352bb027dd3b2ca4
+SIZE (xforms-1.0.93sp1.tar.gz) = 2204088
 SHA256 (xforms-1.0-i18n_7.patch) = 337b32d46766184f24b409976ece77074db6f37612890c83ba8d352d5ee8ac2e
 SIZE (xforms-1.0-i18n_7.patch) = 48814
diff --git a/x11-toolkits/xforms/files/patch-aa b/x11-toolkits/xforms/files/patch-aa
deleted file mode 100644
index ba70cd885776..000000000000
--- a/x11-toolkits/xforms/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Imakefile.orig	Tue Dec  3 12:25:43 2002
-+++ Imakefile	Wed Dec 18 21:25:38 2002
-@@ -21,3 +21,2 @@
- 
--#define DebugSymbols YES
- 
-@@ -45,10 +45,10 @@
- #define TiffIncLoc /usr/local/include
- #define TiffLibLoc /usr/local/lib
- 
--#define NonstandardJpeg NO
-+#define NonstandardJpeg YES
- 
--#define JpegIncLoc /usr/local/include
--#define JpegLibLoc /usr/local/lib
-+#define JpegIncLoc $(LOCALBASE)/include
-+#define JpegLibLoc $(LOCALBASE)/lib
- 
- ######################################################################
- #                                                                    #
diff --git a/x11-toolkits/xforms/files/patch-ab b/x11-toolkits/xforms/files/patch-ab
deleted file mode 100644
index 2415d92deefe..000000000000
--- a/x11-toolkits/xforms/files/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
---- fdesign/Imakefile.orig	Sun Oct  6 23:19:19 2002
-+++ fdesign/Imakefile	Sun Oct  6 23:20:13 2002
-@@ -78,6 +78,8 @@
- INCDIR		= XFormsNonstandardInstallDir/include
- #endif
- 
-+EXTRA_LDOPTIONS	= $(FORMSLIB)
-+
- EXTRA_INCLUDES  = \
- 		  $(SNPINC) \
- 		  -I$(BUILDINCDIR) \
---- demos/Imakefile.orig	Fri Sep 27 16:11:45 2002
-+++ demos/Imakefile	Tue Oct  8 18:33:33 2002
-@@ -97,6 +97,9 @@
- DEPOBJS		= $(DEPSRCS:.c=.o)
- PROGRAMS	= $(DEMOSRCS:.c=)
- 
-+JPEGLIBLOC	= JpegLibLoc
-+JPEGLIB		= -L$(JPEGLIBLOC) -ljpeg
-+
- #if Solaris64Bit
- LDPRELIB	= -L/usr/openwin/lib/sparcv9 -L/usr/local/lib/sparcv9
- CCENVSETUP	= LD_RUN_PATH=/usr/openwin/lib/sparcv9
-@@ -125,6 +128,10 @@
- DEPSNPLIB	= $(SNPLIBDIR)/libformssnp.a
- #endif
- 
-+EXTRA_LDOPTIONS	= $(FORMSLIB) \
-+		  $(IMAGELIB) \
-+		  $(SNPLIB)
-+
- EXTRA_INCLUDES  = \
- 		  $(SNPINC) \
- 		  -I$(BUILDINCDIR) \
-@@ -138,12 +145,9 @@
- 
- EXTRA_LIBRARIES	= \
- 		  $(STATIC) \
--		  $(IMAGELIB) \
--		  $(FORMSLIB) \
- 		  $(XPMLIB) \
--		  $(SNPLIB) \
- 		  $(UNSTATIC) \
--		  $(JPEG) \
-+		  $(JPEGLIB) \
- 		  -lm
- 
- EXTRA_DEFINES	= 
diff --git a/x11-toolkits/xforms/files/patch-ac b/x11-toolkits/xforms/files/patch-ac
deleted file mode 100644
index dfb8cb8743ef..000000000000
--- a/x11-toolkits/xforms/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- fd2ps/Imakefile.orig	Mon Oct  7 01:14:21 2002
-+++ fd2ps/Imakefile	Mon Oct  7 01:14:35 2002
-@@ -68,8 +68,8 @@
- 
- EXTRA_LIBRARIES	= \
- 		  $(STATIC) \
--		  $(IMAGELIB) \
- 		  $(FORMSLIB) \
-+		  $(XPMLIB) \
- 		  $(SNPLIB) \
- 		  $(UNSTATIC) \
- 		  -lm
diff --git a/x11-toolkits/xforms/pkg-descr b/x11-toolkits/xforms/pkg-descr
index fe8a1541687b..93f2bedf8504 100644
--- a/x11-toolkits/xforms/pkg-descr
+++ b/x11-toolkits/xforms/pkg-descr
@@ -6,3 +6,5 @@ and menus etc. integrated into an easy and efficient object/event
 callback execution model that allows fast and easy construction of
 X-applications. In addition, the library is extensible and new objects
 can easily be created and added to the library.
+
+WWW: http://xforms-toolkit.org/
diff --git a/x11-toolkits/xforms/pkg-plist b/x11-toolkits/xforms/pkg-plist
index a8ec02e2d83f..3e595e24c160 100644
--- a/x11-toolkits/xforms/pkg-plist
+++ b/x11-toolkits/xforms/pkg-plist
@@ -1,14 +1,17 @@
 bin/fd2ps
 bin/fdesign
-include/X11/flimage.h
-include/X11/forms.h
-include/X11/glcanvas.h
+include/flimage.h
+include/forms.h
+include/glcanvas.h
 lib/libflimage.a
+lib/libflimage.la
 lib/libflimage.so
-lib/libflimage.so.1
+lib/libflimage.so.2
 lib/libforms.a
+lib/libforms.la
 lib/libforms.so
-lib/libforms.so.1
+lib/libforms.so.2
 lib/libformsGL.a
+lib/libformsGL.la
 lib/libformsGL.so
-lib/libformsGL.so.1
+lib/libformsGL.so.2