From 11632737ad9ef4040cc3bafd1ac17ede3c31c2bb Mon Sep 17 00:00:00 2001 From: jschauma Date: Sat, 28 Dec 2002 19:49:06 +0000 Subject: Update to latest version 1.0 using patches provided by Jeremey C. Reed (reed at reedmedia dot net) in to tech-pkg. xforms is now LGPL. Changes: V1.0RC6.1 November 19, 2002 o. Fixed early tooltip hide causing recursive fl_free_forms() entry. o. Fixed typo in `lib/Imakefile'. V1.0RC6 November 16, 2002 o. TabFolder coordinate update corrected. (Angus Leeming) o. Tooltips could be orphaned when form hidden. (Angus Leeming) V1.0RC5.2 October 2, 2002 o. Documented `InstallNonstandard' procedure. V1.0RC5.1 October 1, 2002 o. Mac OS X build support. V1.0RC3 June 5, 2002 o. Fixed condition in forms.c preventing use of cursor keys. o. Fumigated with -Wall, eliminating all complaints in xforms sources. V1.0RC2 June 1, 2002 o. Picked up some missing prototypes in `flimage.h'. o. Deleted fl_snprintf() with snprintf() and changed all references thereto. Added a new library for those lacking the latter function, filched from the SpamAssassin distributon, of all things. Had to hack it a bit to get it to work. Others, on other systems, may have to as well. V1.0RC1 May 30, 2002 o. Very minor API changes. `FL_ERROR_FUNC' has been typedef'd for fl_set_error_handler() function. `FL_VAL_FILTER' has also been typedef'd for use by fl_set_{counter,slider}_filter(). Neither of these changes should affect much of anything. o. The flimage functions are in their own library now: libflimage. They should be usable standalone, but I have not had an opportunity to test them. o. The OpenGL functions are in their own library now: libformsGL fl_add_glcanvas() and its ilk live there. Application build scripts/ Makefiles should include -lformsGL. o. The Xpm library is no longer built or distributed with XForms. o. The majority of the function prototypes in `forms.h' have been expanded to include variable names. o. various bug fixes. --- x11/xforms/DESCR | 8 ++++-- x11/xforms/Makefile | 9 ++++--- x11/xforms/PLIST | 11 ++++++--- x11/xforms/buildlink2.mk | 4 +-- x11/xforms/distinfo | 16 ++++++------ x11/xforms/patches/patch-aa | 60 ++++++++++++++++++++++++++++----------------- x11/xforms/patches/patch-ab | 44 +++++++++------------------------ x11/xforms/patches/patch-ac | 39 +++++++++-------------------- x11/xforms/patches/patch-ad | 44 +++++++++------------------------ x11/xforms/patches/patch-ae | 22 ++++++++--------- 10 files changed, 115 insertions(+), 142 deletions(-) (limited to 'x11/xforms') diff --git a/x11/xforms/DESCR b/x11/xforms/DESCR index 79dd5c77755..6216d84f3d2 100644 --- a/x11/xforms/DESCR +++ b/x11/xforms/DESCR @@ -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 --git a/x11/xforms/Makefile b/x11/xforms/Makefile index bed78a5695b..e28db2a9666 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.42 2002/09/21 00:24:03 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2002/12/28 19:49:07 jschauma 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 @@ MAKE_ENV= DEPEND_DEFINES="${CPPFLAGS}" 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 --git a/x11/xforms/PLIST b/x11/xforms/PLIST index 916bb97c9f8..3c2955c5b89 100644 --- a/x11/xforms/PLIST +++ b/x11/xforms/PLIST @@ -1,10 +1,15 @@ -@comment $NetBSD: PLIST,v 1.1 2002/04/17 04:40:36 fredb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/12/28 19:49:07 jschauma Exp $ bin/fd2ps bin/fdesign +include/X11/flimage.h include/X11/forms.h +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 +lib/libforms.so.1 +lib/libforms.so.${PKGVERSION} man/cat1/fd2ps.0 man/cat1/fdesign.0 diff --git a/x11/xforms/buildlink2.mk b/x11/xforms/buildlink2.mk index 7c5a75fcf95..1ae257fe419 100644 --- a/x11/xforms/buildlink2.mk +++ b/x11/xforms/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:24:01 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/12/28 19:49:07 jschauma Exp $ .if !defined(XFORMS_BUILDLINK2_MK) 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 --git a/x11/xforms/distinfo b/x11/xforms/distinfo index 233a75b8074..1e1ecb44c21 100644 --- a/x11/xforms/distinfo +++ b/x11/xforms/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2002/09/21 00:24:04 jlam Exp $ +$NetBSD: distinfo,v 1.12 2002/12/28 19:49:07 jschauma 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) = a7d53b076197d36a6f2cf18e23b5f102fe0182ec +SHA1 (patch-ab) = 5f0dedd0e35b952d0e4512c5e396ededcf85f994 +SHA1 (patch-ac) = 55c32e091b1da5441e4c652d3e4a002202a6d076 +SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b +SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821 diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa index bb0146937e4..d39c3c713e0 100644 --- a/x11/xforms/patches/patch-aa +++ b/x11/xforms/patches/patch-aa @@ -1,30 +1,46 @@ -$NetBSD: patch-aa,v 1.7 2002/08/25 19:24:01 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2002/12/28 19:49:08 jschauma 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 + /* 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 --CDEBUGFLAGS = -g $(OPTIMZER) -+CDEBUGFLAGS = -g $(OPTIMIZER) +-#define JpegIncLoc /usr/local/include +-#define JpegLibLoc /usr/local/lib ++#define JpegIncLoc ${LOCALBASE}/include ++#define JpegLibLoc ${LOCALBASE}/lib - IMAKE_DEFINES = \ - -DUseSystemXpm=UseSystemXpm \ + ###################################################################### + # # diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab index 5374766b263..970813dee33 100644 --- a/x11/xforms/patches/patch-ab +++ b/x11/xforms/patches/patch-ab @@ -1,42 +1,22 @@ -$NetBSD: patch-ab,v 1.5 2002/09/21 00:24:04 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2002/12/28 19:49:09 jschauma Exp $ + +--- 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 @@ ---- 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 @@ - FORMSLIBDIR = $(TOP)/lib FORMSINCDIR = $(FORMSLIBDIR) -FORMSLIB = -L$(FORMSLIBDIR) -lforms +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 + IMAGELIBDIR = $(TOP)/image +@@ -154,7 +154,7 @@ + -I. - EXTRA_INCLUDES = \ -@@ -138,7 +140,7 @@ - -I$(FORMSINCDIR) \ - -Ifd \ - -I. \ -- -I/usr/local/include \ -+ -I${LOCALBASE}/include \ - /* Don't remove this line */ + DEPEND_DEFINES = \ +- -I/usr/local/include ++ -I${LOCALBASE}/include EXTRA_LIBRARIES = \ + $(STATIC) \ diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac index 2de624bb3ed..0ef222471b8 100644 --- a/x11/xforms/patches/patch-ac +++ b/x11/xforms/patches/patch-ac @@ -1,37 +1,22 @@ -$NetBSD: patch-ac,v 1.3 2002/09/21 00:24:04 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2002/12/28 19:49:09 jschauma 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 --git a/x11/xforms/patches/patch-ad b/x11/xforms/patches/patch-ad index 78539cceca6..9c35026d888 100644 --- a/x11/xforms/patches/patch-ad +++ b/x11/xforms/patches/patch-ad @@ -1,42 +1,22 @@ -$NetBSD: patch-ad,v 1.3 2002/09/21 00:24:04 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2002/12/28 19:49:09 jschauma Exp $ + +--- 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 @@ ---- 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 @@ - FORMSLIBDIR = $(TOP)/lib FORMSINCDIR = $(FORMSLIBDIR) -FORMSLIB = -L$(FORMSLIBDIR) -lforms +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 --git a/x11/xforms/patches/patch-ae b/x11/xforms/patches/patch-ae index 3145d84484f..8f1dbcc4665 100644 --- a/x11/xforms/patches/patch-ae +++ b/x11/xforms/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.2 2002/09/21 00:24:05 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2002/12/28 19:49:09 jschauma 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 + + DEPEND_DEFINES = \ +- -I/usr/local/include ++ -I${LOCALBASE}/include - EXTRA_DEFINES = \ + #if !BuildGL + NO_GL = -DNO_GL -- cgit v1.2.3