5 files changed, 66 insertions, 12 deletions

diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 6b8606ee019d..94921290f118 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	xforms
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/
-FULLVERSION=	${PORTVERSION}RC4
+FULLVERSION=	${PORTVERSION}RC5.2
 DISTNAME=	${PORTNAME}-${FULLVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-toolkits/xforms/distinfo b/x11-toolkits/xforms/distinfo
index a2e3d0193cb8..785800947490 100644
--- a/x11-toolkits/xforms/distinfo
+++ b/x11-toolkits/xforms/distinfo
@@ -1 +1 @@
-MD5 (xforms-1.0RC4.tgz) = 1166cec00a56754837ea5bb76df97483
+MD5 (xforms-1.0RC5.2.tgz) = e6cecdb5a0d1a4e44d26501175b0927a
diff --git a/x11-toolkits/xforms/files/patch-aa b/x11-toolkits/xforms/files/patch-aa
index 4c638bc5ad9f..875a5a5a18d0 100644
--- a/x11-toolkits/xforms/files/patch-aa
+++ b/x11-toolkits/xforms/files/patch-aa
@@ -1,11 +1,34 @@
---- Imakefile.orig	Thu Jun  6 10:45:33 2002
-+++ Imakefile	Tue Jul 16 02:25:45 2002
-@@ -3,7 +3,7 @@
+--- Imakefile.orig	Tue Oct  1 19:51:51 2002
++++ Imakefile	Mon Oct  7 01:16:37 2002
+@@ -2,7 +2,7 @@
+ 
  /* Fairly important stuff */
  
- #define DoOptimize YES
 -#define OptimizationLevel -O4
 +#define OptimizationLevel -O
  #define DoWall NO
  
  #define BuildShared YES
+@@ -31,7 +31,7 @@
+ 
+ /* Out in the Tall Weeds */
+ 
+-#define InstallNonstandard YES
++#define InstallNonstandard NO
+ #define XFormsNonstandardInstallDir /usr/local
+ 
+ #define NonstandardXpm NO 
+@@ -44,10 +44,10 @@
+ #define TiffIncLoc /put/the/include/path/here
+ #define TiffLibLoc /put/the/library/path/here
+ 
+-#define NonstandardJpeg NO
++#define NonstandardJpeg YES
+ 
+-#define JpegIncLoc /put/the/include/path/here
+-#define JpegLibLoc /put/the/library/path/here
++#define JpegIncLoc $(LOCALBASE)/include
++#define JpegLibLoc $(LOCALBASE)/lib
+ 
+ ######################################################################
+ #                                                                    #
diff --git a/x11-toolkits/xforms/files/patch-ab b/x11-toolkits/xforms/files/patch-ab
index b2dc594963df..2d2e2227e60c 100644
--- a/x11-toolkits/xforms/files/patch-ab
+++ b/x11-toolkits/xforms/files/patch-ab
@@ -1,5 +1,5 @@
---- fdesign/Imakefile.orig	Fri Jun 28 02:23:08 2002
-+++ fdesign/Imakefile	Fri Jun 28 02:23:51 2002
+--- 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
@@ -9,9 +9,19 @@
  EXTRA_INCLUDES  = \
  		  $(SNPINC) \
  		  -I$(BUILDINCDIR) \
---- demos/Imakefile.orig	Fri Jun 28 02:26:52 2002
-+++ demos/Imakefile	Fri Jun 28 02:27:23 2002
-@@ -137,6 +137,8 @@
+--- demos/Imakefile.orig	Fri Sep 27 16:11:45 2002
++++ demos/Imakefile	Mon Oct  7 01:27:39 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,8 @@
  DEPSNPLIB	= $(SNPLIBDIR)/libformssnp.a
  #endif
  
@@ -20,3 +30,12 @@
  EXTRA_INCLUDES  = \
  		  $(SNPINC) \
  		  -I$(BUILDINCDIR) \
+@@ -143,7 +148,7 @@
+ 		  $(XPMLIB) \
+ 		  $(SNPLIB) \
+ 		  $(UNSTATIC) \
+-		  $(JPEG) \
++		  $(JPEGLIB) \
+ 		  -lm
+ 
+ EXTRA_DEFINES	= 
diff --git a/x11-toolkits/xforms/files/patch-ac b/x11-toolkits/xforms/files/patch-ac
new file mode 100644
index 000000000000..dfb8cb8743ef
--- /dev/null
+++ b/x11-toolkits/xforms/files/patch-ac
@@ -0,0 +1,12 @@
+--- 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