Subject: to x11/xforms-1.0-release patch
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 12/26/2002 04:35:29
For some reason, when I tried to build xforms, I couldn't fetch the source
from various FTP sites. Then I noticed that some of the xforms download
sites had new version, but not the xforms-0.9999 anymore.
So I updated to xforms-1.0-release. The patch is below. Only tested a
little.
Jeremy C. Reed
http://bsd.reedmedia.net/
diff -ur x11/xforms.orig/DESCR x11/xforms/DESCR
--- x11/xforms.orig/DESCR Tue Apr 16 21:40:36 2002
+++ x11/xforms/DESCR Wed Dec 25 12:47:04 2002
@@ -1,5 +1,9 @@
-This is the first Open Source distribution of the XForms Library,
+This is the Open Source distribution of the XForms Library,
a graphical user interface toolkit for X Windows. XForms is
licensed under the LGPL (Lesser Gnu Public License) version 2.1.
-This package is current built without OpenGL support.
+This package includes Form Designer (fdesign), a WYSIWYG interface
+builder program. fdesign output can also be translated into
+Postscript.
+
+This package is built without OpenGL support.
diff -ur x11/xforms.orig/Makefile x11/xforms/Makefile
--- x11/xforms.orig/Makefile Fri Sep 20 17:24:03 2002
+++ x11/xforms/Makefile Wed Dec 25 10:59:53 2002
@@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.42 2002/09/21 00:24:03 jlam Exp $
#
-DISTNAME= xforms-0.9999
+DISTNAME= xforms-1.0-release
+PKGNAME= xforms-1.0
CATEGORIES= x11
-MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/
+MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/ \
+ http://archive.cs.uu.nl/mirror/XFORMS/OpenSource/
EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
@@ -18,6 +20,7 @@
SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}"
.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -ur x11/xforms.orig/PLIST x11/xforms/PLIST
--- x11/xforms.orig/PLIST Tue Apr 16 21:40:36 2002
+++ x11/xforms/PLIST Wed Dec 25 11:42:45 2002
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1 2002/04/17 04:40:36 fredb Exp $
+@comment $NetBSD$
bin/fd2ps
bin/fdesign
+include/X11/flimage.h
include/X11/forms.h
+lib/X11/doc/html/fd2ps.1.html
+lib/X11/doc/html/fdesign.1.html
+lib/libflimage.a
+lib/libflimage.so
+lib/libflimage.so.1
+lib/libflimage.so.${PKGVERSION}
lib/libforms.a
lib/libforms.so
-lib/libforms.so.0
-lib/libforms.so.0.9999
-man/cat1/fd2ps.0
-man/cat1/fdesign.0
+lib/libforms.so.1
+lib/libforms.so.${PKGVERSION}
+man/man1/fd2ps.1x
+man/man1/fdesign.1x
+@dirrm lib/X11/doc/html
diff -ur x11/xforms.orig/buildlink2.mk x11/xforms/buildlink2.mk
--- x11/xforms.orig/buildlink2.mk Sun Aug 25 12:24:01 2002
+++ x11/xforms/buildlink2.mk Wed Dec 25 10:57:16 2002
@@ -4,7 +4,7 @@
XFORMS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= xforms
-BUILDLINK_DEPENDS.xforms?= xforms>=0.9999
+BUILDLINK_DEPENDS.xforms?= xforms>=1.0
BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms
EVAL_PREFIX+= BUILDLINK_PREFIX.xforms=xforms
diff -ur x11/xforms.orig/distinfo x11/xforms/distinfo
--- x11/xforms.orig/distinfo Fri Sep 20 17:24:04 2002
+++ x11/xforms/distinfo Wed Dec 25 10:41:07 2002
@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.11 2002/09/21 00:24:04 jlam Exp $
-SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217
-Size (xforms-0.9999.tgz) = 1040128 bytes
-SHA1 (patch-aa) = c20083fc9f55986853c63726a9ad74e7bf233ef3
-SHA1 (patch-ab) = 1d5b440c88e2ea5915b050a28056cd4ad378996e
-SHA1 (patch-ac) = 47de2d8cbec85a8e9509c667bfe814fd0103eede
-SHA1 (patch-ad) = 964b6df86a0bd56f66073b2d121d7c12d0f89bdb
-SHA1 (patch-ae) = a6c3847470591a8d7e219fa5b0390fa145092dd7
+SHA1 (xforms-1.0-release.tgz) = e25a31351c52472de88352388cf879512b20fc62
+Size (xforms-1.0-release.tgz) = 1013294 bytes
+SHA1 (patch-aa) = 7e7b64a96f00eecfa62a505d21c4f3abacb8c0f0
+SHA1 (patch-ab) = bf7496e46fdcccd605c18cfac8d72619995cd4a1
+SHA1 (patch-ac) = 085a85b7d899853c2bf19231dac97aa06e52d350
+SHA1 (patch-ad) = 996a63c92b815dc0676aef57a3f45e778888dfa8
+SHA1 (patch-ae) = 5d7629849f6e7d0ac37dfcb983290b56c3570391
diff -ur x11/xforms.orig/patches/patch-aa x11/xforms/patches/patch-aa
--- x11/xforms.orig/patches/patch-aa Sun Aug 25 12:24:01 2002
+++ x11/xforms/patches/patch-aa Wed Dec 25 09:59:15 2002
@@ -1,30 +1,44 @@
-$NetBSD: patch-aa,v 1.7 2002/08/25 19:24:01 jlam Exp $
-
---- Imakefile.orig Tue Apr 2 19:05:09 2002
-+++ Imakefile
-@@ -4,12 +4,12 @@
- #define Optimize YES
- #define UseSystemXpm YES
- #define HaveStrerror YES
+--- Imakefile.orig 2002-12-25 09:50:16.000000000 -0800
++++ Imakefile 2002-12-25 09:59:05.000000000 -0800
+@@ -6,9 +6,9 @@
+ #define DoWall NO
+
+ #define BuildShared YES
-#define StaticLink YES
--#define BuildGL YES
+#define StaticLink NO
+
+-#define BuildGL YES
+#define BuildGL NO
- #define BuildShared YES
--#define Solaris64Bit YES
-+#define Solaris64Bit NO
--#define XFormsInstallDir /usr/local
-+#define XFormsInstallDir $(PREFIX)
- #define XFormsLibRev 0.9999
-
- #define OptimizationLevel -O4
-@@ -37,7 +37,7 @@ OPTIMIZER = OptimizationLevel
- OPTIMIZER =
- #endif
--CDEBUGFLAGS = -g $(OPTIMZER)
-+CDEBUGFLAGS = -g $(OPTIMIZER)
+ /* Less Important or System Specific */
+@@ -33,22 +33,22 @@
+ /* Out in the Tall Weeds */
+
+ #define InstallNonstandard NO
+-#define XFormsNonstandardInstallDir /usr/local
++#define XFormsNonstandardInstallDir $(PREFIX)
+
+ #define NonstandardXpm NO
+
+-#define XpmIncLoc /usr/local/include
+-#define XpmLibLoc /usr/local/lib
++#define XpmIncLoc ${LOCALBASE}/include
++#define XpmLibLoc ${LOCALBASE}/lib
+
+ #define NonstandardTiff NO
+
+-#define TiffIncLoc /usr/local/include
+-#define TiffLibLoc /usr/local/lib
++#define TiffIncLoc ${LOCALBASE}/include
++#define TiffLibLoc ${LOCALBASE}/lib
+
+ #define NonstandardJpeg NO
+
+-#define JpegIncLoc /usr/local/include
+-#define JpegLibLoc /usr/local/lib
++#define JpegIncLoc ${LOCALBASE}/include
++#define JpegLibLoc ${LOCALBASE}/lib
- IMAKE_DEFINES = \
- -DUseSystemXpm=UseSystemXpm \
+ ######################################################################
+ # #
diff -ur x11/xforms.orig/patches/patch-ab x11/xforms/patches/patch-ab
--- x11/xforms.orig/patches/patch-ab Fri Sep 20 17:24:04 2002
+++ x11/xforms/patches/patch-ab Wed Dec 25 10:39:15 2002
@@ -1,19 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2002/09/21 00:24:04 jlam Exp $
-
---- demos/Imakefile.orig Mon Apr 1 10:56:26 2002
-+++ demos/Imakefile
-@@ -106,7 +106,9 @@
- DEPOBJS = $(DEPSRCS:.c=.o)
- PROGRAMS = $(DEMOSRCS:.c=)
-
--JPEGLIBLOC = /usr/local/lib
-+LDPRELIBS =
-+JPEGLIBLOC = ${LOCALBASE}/lib
-+JPEGLIB = -L${JPEGLIBLOC} -ljpeg
-
- #if Solaris64Bit
- LDPRELIB = -L/usr/openwin/lib/sparcv9
-@@ -120,7 +122,7 @@
+--- demos/Imakefile.orig 2002-11-19 12:50:52.000000000 -0800
++++ demos/Imakefile 2002-12-25 10:38:30.000000000 -0800
+@@ -109,7 +109,7 @@
FORMSLIBDIR = $(TOP)/lib
FORMSINCDIR = $(FORMSLIBDIR)
@@ -21,22 +8,13 @@
+FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a
- #if !UseSystemXpm
-@@ -130,7 +132,7 @@
- DEPXPMLIB = $(XPMLIBDIR)/libXpm.a
- XPMINCLUDE = -I$(XPMINCDIR)
- #else
--XPMLIB = -lXpm
-+XPMLIB = -L$(USRLIBDIR) -lXpm
- #endif
-
- EXTRA_INCLUDES = \
-@@ -138,7 +140,7 @@
- -I$(FORMSINCDIR) \
- -Ifd \
- -I. \
-- -I/usr/local/include \
-+ -I${LOCALBASE}/include \
- /* Don't remove this line */
+ IMAGELIBDIR = $(TOP)/image
+@@ -154,7 +154,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ -I${LOCALBASE}/include
EXTRA_LIBRARIES = \
+ $(STATIC) \
diff -ur x11/xforms.orig/patches/patch-ac x11/xforms/patches/patch-ac
--- x11/xforms.orig/patches/patch-ac Fri Sep 20 17:24:04 2002
+++ x11/xforms/patches/patch-ac Wed Dec 25 10:40:16 2002
@@ -1,37 +1,20 @@
-$NetBSD: patch-ac,v 1.3 2002/09/21 00:24:04 jlam Exp $
-
---- fd2ps/Imakefile.orig Tue Apr 2 11:34:02 2002
-+++ fd2ps/Imakefile
-@@ -30,9 +30,13 @@
-
- OBJS = $(SRCS:.c=.o)
-
-+LDPRELIBS =
-+JPEGLIBLOC = ${LOCALBASE}/lib
-+JPEGLIB = -L${JPEGLIBLOC} -ljpeg
-+
+--- fd2ps/Imakefile.orig 2002-10-01 09:40:02.000000000 -0700
++++ fd2ps/Imakefile 2002-12-25 10:39:45.000000000 -0800
+@@ -32,7 +32,7 @@
+ #if !defined( PpcDarwinArchitecture )
FORMSLIBDIR = $(TOP)/lib
FORMSINCDIR = $(FORMSLIBDIR)
-FORMSLIB = -L$(FORMSLIBDIR) -lforms
+FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a
-
- #if !UseSystemXpm
-@@ -41,6 +45,8 @@
- XPMLIB = -L$(XPMLIBDIR)/lib -lXpm
- DEPXPMLIB = $(XPMLIBDIR)/lib/libXpm.a
- XPMINCLUDE = -I$(XPMINCDIR)
-+#else
-+XPMLIB = -L$(USRLIBDIR) -lXpm
#endif
- #if Solaris64Bit
-@@ -55,7 +61,7 @@
- -Ispec \
- -Ixpm \
- -I. \
-- -I/usr/local/include \
-+ -I${LOCALBASE}/include \
- /* Don't remove this line */
+@@ -64,7 +64,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ -I${LOCALBASE}/include
EXTRA_LIBRARIES = \
+ $(STATIC) \
diff -ur x11/xforms.orig/patches/patch-ad x11/xforms/patches/patch-ad
--- x11/xforms.orig/patches/patch-ad Fri Sep 20 17:24:04 2002
+++ x11/xforms/patches/patch-ad Wed Dec 25 10:40:55 2002
@@ -1,19 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2002/09/21 00:24:04 jlam Exp $
-
---- fdesign/Imakefile.orig Tue Apr 2 11:33:21 2002
-+++ fdesign/Imakefile
-@@ -47,6 +47,10 @@
-
- OBJS = $(SRCS:.c=.o)
-
-+LDPRELIBS =
-+JPEGLIBLOC = ${LOCALBASE}/lib
-+JPEGLIB = -L${JPEGLIBLOC} -ljpeg
-+
- #if Solaris64Bit
- LDPRELIB = -L/usr/openwin/lib/sparcv9
- CCENVSETUP = LD_RUN_PATH=/usr/openwin/lib/sparcv9
-@@ -59,7 +63,7 @@
+--- fdesign/Imakefile.orig 2002-11-16 13:29:20.000000000 -0800
++++ fdesign/Imakefile 2002-12-25 10:40:31.000000000 -0800
+@@ -71,7 +71,7 @@
FORMSLIBDIR = $(TOP)/lib
FORMSINCDIR = $(FORMSLIBDIR)
@@ -21,22 +8,13 @@
+FORMSLIB = -L$(FORMSLIBDIR) -lforms $(JPEGLIB) $(XPMLIB) $(LDFLAGS)
DEPFORMSLIB = $(FORMSLIBDIR)/libforms.a
- #if !UseSystemXpm
-@@ -69,7 +73,7 @@
- DEPXPMLIB = $(XPMLIBDIR)/lib/libXpm.a
- XPMINCLUDE = -I$(XPMINCDIR)
- #else
--XPMLIB = -lXpm
-+XPMLIB = -L$(USRLIBDIR) -lXpm
- #endif
+ #if !HaveSnprintf
+@@ -99,7 +99,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ -I${LOCALBASE}/include
- EXTRA_INCLUDES = \
-@@ -80,7 +84,7 @@
- -Ispec \
- -Ixpm \
- -I. \
-- -I/usr/local/include \
-+ -I${LOCALBASE}/include \
- /* Don't remove this line */
EXTRA_LIBRARIES = \
diff -ur x11/xforms.orig/patches/patch-ae x11/xforms/patches/patch-ae
--- x11/xforms.orig/patches/patch-ae Fri Sep 20 17:24:05 2002
+++ x11/xforms/patches/patch-ae Wed Dec 25 10:05:57 2002
@@ -1,13 +1,11 @@
-$NetBSD: patch-ae,v 1.2 2002/09/21 00:24:05 jlam Exp $
-
---- lib/Imakefile.orig Tue Apr 2 11:27:04 2002
-+++ lib/Imakefile
-@@ -167,7 +167,7 @@
- -Ibitmaps \
- -I. \
- -Ifd \
-- -I/usr/local/include \
-+ -I${LOCALBASE}/include \
- /* Do not remove this line */
+--- lib/Imakefile.orig 2002-12-25 10:05:09.000000000 -0800
++++ lib/Imakefile 2002-12-25 10:05:37.000000000 -0800
+@@ -128,7 +128,7 @@
+ -Ifd
- EXTRA_DEFINES = \
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ -I${LOCALBASE}/include
+
+ #if !BuildGL
+ NO_GL = -DNO_GL