diff options
author | mrg <mrg@pkgsrc.org> | 1999-10-31 12:08:25 +0000 |
---|---|---|
committer | mrg <mrg@pkgsrc.org> | 1999-10-31 12:08:25 +0000 |
commit | 283cca268a9284bc6e83e66c45febaa2dd094176 (patch) | |
tree | 7e750ee611fe1d1c54ad978fee158d379ffd3aed /x11 | |
parent | 4813f1d22dfd4ef22e8d2e1bc84819baad6ec59c (diff) | |
download | pkgsrc-283cca268a9284bc6e83e66c45febaa2dd094176.tar.gz |
these patches were insane. we had 4 patch files. we had 7 files patched.
2 files were patched by 3 of the patches. 2 other files patched by 2 of
the patches, and 3 other single patched files. now, we have 7 separate
patch files.
also, if we're going to enable some of libXpm here, do it all so that it
works with xpkgwedge!
Diffstat (limited to 'x11')
-rw-r--r-- | x11/XmHTML/files/patch-sum | 13 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-aa | 326 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ab | 58 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ac | 95 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ad | 169 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ae | 62 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-af | 14 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ag | 14 |
8 files changed, 313 insertions, 438 deletions
diff --git a/x11/XmHTML/files/patch-sum b/x11/XmHTML/files/patch-sum index 55a38a48233..c076fba5ac2 100644 --- a/x11/XmHTML/files/patch-sum +++ b/x11/XmHTML/files/patch-sum @@ -1,6 +1,9 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:21 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/31 12:08:25 mrg Exp $ -MD5 (patch-aa) = d27ef624b6d1fe068a065fada9392dd3 -MD5 (patch-ab) = 1a763349c890ca3c644e3f2445deabca -MD5 (patch-ac) = 744b8ea0f8648590d1c7a8c77b5a7931 -MD5 (patch-ad) = 99a2258b875f5a9c8b5bae4907c763aa +MD5 (patch-aa) = a94fdc0d0d04efcad3568ec0197ccb5a +MD5 (patch-ab) = c23f0f0d75b8c57a0f603138b58de4a6 +MD5 (patch-ac) = a5b7f0325d94be503823c4d903aa22e1 +MD5 (patch-ad) = 279615a23c977e8e41de607b328e9383 +MD5 (patch-ae) = 6fce0cac241d1e51dfe6213f7f4b056b +MD5 (patch-af) = f09d6f55b2d7a0dac01227e6039287a0 +MD5 (patch-ag) = 930fb123656765378ec8671548fcbdc4 diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa index a4642803dc4..76538bca740 100644 --- a/x11/XmHTML/patches/patch-aa +++ b/x11/XmHTML/patches/patch-aa @@ -1,231 +1,97 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ +$NetBSD: patch-aa,v 1.2 1999/10/31 12:08:26 mrg Exp $ -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/XmHTML.cf XmHTML-1.1.5-hacked/XmHTML.cf -*** XmHTML-1.1.5/XmHTML.cf Sat Aug 8 05:59:31 1998 ---- XmHTML-1.1.5-hacked/XmHTML.cf Thu Jan 21 01:33:21 1999 -*************** -*** 15,19 **** - XCOMM override it here. - XCOMM BUILDINCTOP=<path to root of the XmHTML source tree> -! BUILDINCTOP=/home/newt/src/XmHTML/XmHTML - - XCOMM ---------------------------------------------------------------------- ---- 15,19 ---- - XCOMM override it here. - XCOMM BUILDINCTOP=<path to root of the XmHTML source tree> -! XCOMM BUILDINCTOP=/home/newt/src/XmHTML/XmHTML - - XCOMM ---------------------------------------------------------------------- -*************** -*** 50,54 **** - XCOMM wherever your X includes live) and /usr/X11R6/lib (or wherever your X - XCOMM libraries live) -! XCOMM XPMINCLUDES = -I$(INCROOT) - XCOMM XPMLIBRARIES = -L$(LIBDIR) -lXpm - ---- 50,54 ---- - XCOMM wherever your X includes live) and /usr/X11R6/lib (or wherever your X - XCOMM libraries live) -! XPMINCLUDES = -I${PREFIX}/include - XCOMM XPMLIBRARIES = -L$(LIBDIR) -lXpm - -*************** -*** 61,66 **** - - #define IHaveJPEG YES -! JPEGINC = -! JPEGLIB = -ljpeg - - XCOMM PNG Support. Enabled by default. ---- 61,66 ---- - - #define IHaveJPEG YES -! JPEGINC = -I${PREFIX}/include -! JPEGLIB = -L${PREFIX}/lib -ljpeg - - XCOMM PNG Support. Enabled by default. -*************** -*** 70,75 **** - - #define IHavePNG YES -! PNGINC = -! PNGLIB = -lpng - - XCOMM zlib Support. Enabled by default. PNG support implies zlib. ---- 70,75 ---- - - #define IHavePNG YES -! PNGINC = -I${PREFIX}/include -! PNGLIB = -L${PREFIX}/lib -lpng - - XCOMM zlib Support. Enabled by default. PNG support implies zlib. -*************** -*** 79,84 **** - - #define IHaveZLIB YES -! ZLIBINC = -! ZLIBLIB = -lz -lm - - XCOMM ---------------------------------------------------------------------- ---- 79,84 ---- - - #define IHaveZLIB YES -! ZLIBINC = -I${PREFIX}/include -! ZLIBLIB = -L${PREFIX}/lib -lz -lm - - XCOMM ---------------------------------------------------------------------- -*************** -*** 239,243 **** - EXTRA_DEFINES = -DVERSION=$(VERSION) $(DEFINES) $(IMAGEDEFINES) $(REGDEF) \ - $(DEBUG) $(DMALLOC) -! EXTRA_INCLUDES = -I. -I$(BUILDINCTOP)/include $(IMAGEINCS) $(DMALLOCINC) - EXTRA_LIBRARIES= $(IMAGELIBS) $(DMALLOCLIB) $(SYSLIBS) - #endif ---- 239,243 ---- - EXTRA_DEFINES = -DVERSION=$(VERSION) $(DEFINES) $(IMAGEDEFINES) $(REGDEF) \ - $(DEBUG) $(DMALLOC) -! EXTRA_INCLUDES = -I. -I$(TOP)/include $(IMAGEINCS) $(DMALLOCINC) - EXTRA_LIBRARIES= $(IMAGELIBS) $(DMALLOCLIB) $(SYSLIBS) - #endif -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/book/Imakefile XmHTML-1.1.5-hacked/book/Imakefile -*** XmHTML-1.1.5/book/Imakefile Mon Nov 10 19:11:19 1997 ---- XmHTML-1.1.5-hacked/book/Imakefile Thu Jan 21 13:53:43 1999 -*************** -*** 25,37 **** - - #if DebugLibXmHTML -! XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML_d.a - #else - #if SharedLibXmHTML -! XMHTMLLIB = -L$(BUILDINCTOP)/src -lXmHTML - #else -! XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML.a - #endif - #endif -! XCOMM INCLUDES = -I$(BUILDINCTOP)/src $(DMALLOCINC) - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - ---- 25,37 ---- - - #if DebugLibXmHTML -! XMHTMLLIB = $(TOP)/src/libXmHTML_d.a - #else - #if SharedLibXmHTML -! XMHTMLLIB = -L$(TOP)/src -lXmHTML - #else -! XMHTMLLIB = $(TOP)/src/libXmHTML.a - #endif - #endif -! XCOMM INCLUDES = -I$(TOP)/src $(DMALLOCINC) - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/examples/Imakefile XmHTML-1.1.5-hacked/examples/Imakefile -*** XmHTML-1.1.5/examples/Imakefile Thu Mar 12 17:53:27 1998 ---- XmHTML-1.1.5-hacked/examples/Imakefile Thu Jan 21 13:26:02 1999 -*************** -*** 25,39 **** - - #if DebugLibXmHTML -! XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML_d.a - DEPLIB = $(XMHTMLLIB) - #else - #if SharedLibXmHTML -! XMHTMLLIB = -L$(BUILDINCTOP)/src -lXmHTML - #else -! XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML.a - DEPLIB = $(XMHTMLLIB) - #endif - #endif -! XCOMM INCLUDES = -I$(BUILDINCTOP)/include $(DMALLOCINC) - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - ---- 25,39 ---- - - #if DebugLibXmHTML -! XMHTMLLIB = $(TOP)/src/libXmHTML_d.a - DEPLIB = $(XMHTMLLIB) - #else - #if SharedLibXmHTML -! XMHTMLLIB = -L$(TOP)/src -lXmHTML - #else -! XMHTMLLIB = $(TOP)/src/libXmHTML.a - DEPLIB = $(XMHTMLLIB) - #endif - #endif -! XCOMM INCLUDES = -I$(TOP)/include $(DMALLOCINC) - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) - -*************** -*** 41,45 **** - XCOMM Richard's http client-side library (used by example_4) - XCOMM -! HTTPLIB = -L$(BUILDINCTOP)/http -lhttp - - XCOMM required libraries ---- 41,45 ---- - XCOMM Richard's http client-side library (used by example_4) - XCOMM -! HTTPLIB = -L$(TOP)/http -lhttp - - XCOMM required libraries -*************** -*** 55,59 **** - - OBJS1 = example_1.o -! OBJS2 = example_2.o $(MOBJS) - OBJS4 = example_4.o - ---- 55,59 ---- - - OBJS1 = example_1.o -! OBJS2 = example_2.o $(MOBJS) history.o - OBJS4 = example_4.o - -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/src/Imakefile XmHTML-1.1.5-hacked/src/Imakefile -*** XmHTML-1.1.5/src/Imakefile Thu Jun 4 10:52:46 1998 ---- XmHTML-1.1.5-hacked/src/Imakefile Thu Jan 21 13:50:59 1999 -*************** -*** 108,112 **** - XCOMM - XCOMM Header files used by various other targets in the XmHTML source tree -! PUBHDRS = XmHTMLfuncs.h LZWStream.h XCC.h miniparse.h stack.h - - XCOMM ---- 108,112 ---- - XCOMM - XCOMM Header files used by various other targets in the XmHTML source tree -! PUBHDRS = XmHTMLfuncs.h LZWStream.h XCC.h miniparse.h stack.h icons.h - - XCOMM -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/src/parse.c XmHTML-1.1.5-hacked/src/parse.c -*** XmHTML-1.1.5/src/parse.c Thu Sep 10 16:46:38 1998 ---- XmHTML-1.1.5-hacked/src/parse.c Thu Jan 21 13:52:38 1999 -*************** -*** 139,143 **** - #include <XmHTML/HTMLWarnings.h> - #undef XmHTML_STRINGDEFINES -! #include "icons.h" /* W3C Working Draft WD-wwwicn-960729 */ - #else - #include "toolkit.h" ---- 139,143 ---- - #include <XmHTML/HTMLWarnings.h> - #undef XmHTML_STRINGDEFINES -! #include <XmHTML/icons.h> - #else - #include "toolkit.h" -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/tools/Imakefile XmHTML-1.1.5-hacked/tools/Imakefile -*** XmHTML-1.1.5/tools/Imakefile Wed Dec 10 23:10:42 1997 ---- XmHTML-1.1.5-hacked/tools/Imakefile Thu Jan 21 13:48:24 1999 -*************** -*** 21,25 **** - #endif - -! EXTRA_INCLUDES = -I. -I$(BUILDINCTOP)/include - - XCOMM dependency X libraries, required for reptype ---- 21,25 ---- - #endif - -! EXTRA_INCLUDES = -I. -I$(TOP)/include - - XCOMM dependency X libraries, required for reptype +diff -ru /tmp/XmHTML-1.1.5/XmHTML.cf XmHTML-1.1.5/XmHTML.cf +--- /tmp/XmHTML-1.1.5/XmHTML.cf Sat Aug 8 19:59:31 1998 ++++ XmHTML-1.1.5/XmHTML.cf Sun Oct 31 21:01:10 1999 +@@ -8,22 +8,32 @@ + XCOMM + XCOMM See the file LICENSE for the full copyright statement. + ++XCOMM We don't want Library.tmpl to install libraries. ++ ++#if !defined (LibInstall) ++# define LibInstall NO ++# define XmHTMLLibInstall YES ++#else ++# if LibInstall ++# define LibInstall NO ++# define XmHTMLLibInstall YES ++# else ++# define XmHTMLLibInstall NO ++# endif ++#endif ++ + XCOMM ---------------------------------------------------------------------- + XCOMM Root of XmHTML Source Tree + XCOMM ---------------------------------------------------------------------- +-XCOMM If BUILDINCTOP is not or incorrectly set on your system, you can +-XCOMM override it here. +-XCOMM BUILDINCTOP=<path to root of the XmHTML source tree> +-BUILDINCTOP=/home/newt/src/XmHTML/XmHTML + + XCOMM ---------------------------------------------------------------------- + XCOMM Installation Directories + XCOMM ---------------------------------------------------------------------- + XCOMM This specifies where the XmHTML and http library will be installed +-#define XmHTMLLibDir $(USRLIBDIR) ++#define XmHTMLLibDir ${PREFIX}/lib + + XCOMM This specifies where the XmHTML and http header files will be installed +-#define XmHTMLIncDir $(INCROOT)/XmHTML ++#define XmHTMLIncDir ${PREFIX}/include/XmHTML + + XCOMM ---------------------------------------------------------------------- + XCOMM Common Desktop Environment +@@ -49,8 +59,8 @@ + XCOMM paths to xpm.h and libXpm. The defaults are /usr/X11R6/include (or + XCOMM wherever your X includes live) and /usr/X11R6/lib (or wherever your X + XCOMM libraries live) +-XCOMM XPMINCLUDES = -I$(INCROOT) +-XCOMM XPMLIBRARIES = -L$(LIBDIR) -lXpm ++XPMINCLUDES = -I${PREFIX}/include ++XPMLIBRARIES = -L$(LIBDIR) -lXpm + + XCOMM JPEG Support. Enabled by default. + XCOMM You require libjpeg, version 6 or above. If you don't have this lib +@@ -60,8 +70,8 @@ + XCOMM Required include files: jpeglib.h, jconfig.h, jmorecfg.h + + #define IHaveJPEG YES +-JPEGINC = +-JPEGLIB = -ljpeg ++JPEGINC = -I${PREFIX}/include ++JPEGLIB = -L${PREFIX}/lib -ljpeg + + XCOMM PNG Support. Enabled by default. + XCOMM You require libpng, version 0.96 or above. If you don't have this lib +@@ -69,8 +79,8 @@ + XCOMM Required include files: png.h, pngconf.h + + #define IHavePNG YES +-PNGINC = +-PNGLIB = -lpng ++PNGINC = -I${PREFIX}/include ++PNGLIB = -L${PREFIX}/lib -lpng + + XCOMM zlib Support. Enabled by default. PNG support implies zlib. + XCOMM You require libz, version 1.0.4 or above. If you don't have this lib +@@ -78,8 +88,8 @@ + XCOMM Required include files: zlib.h, zconf.h + + #define IHaveZLIB YES +-ZLIBINC = +-ZLIBLIB = -lz -lm ++ZLIBINC = -I${PREFIX}/include ++ZLIBLIB = -L${PREFIX}/lib -lz -lm + + XCOMM ---------------------------------------------------------------------- + XCOMM Full Text Searching Using POSIX 1. Regular Expressions +@@ -238,7 +248,7 @@ + + EXTRA_DEFINES = -DVERSION=$(VERSION) $(DEFINES) $(IMAGEDEFINES) $(REGDEF) \ + $(DEBUG) $(DMALLOC) +-EXTRA_INCLUDES = -I. -I$(BUILDINCTOP)/include $(IMAGEINCS) $(DMALLOCINC) ++EXTRA_INCLUDES = -I. -I$(TOP)/include $(IMAGEINCS) $(DMALLOCINC) + EXTRA_LIBRARIES= $(IMAGELIBS) $(DMALLOCLIB) $(SYSLIBS) + #endif + diff --git a/x11/XmHTML/patches/patch-ab b/x11/XmHTML/patches/patch-ab index 0ed26ac6857..e299be625e5 100644 --- a/x11/XmHTML/patches/patch-ab +++ b/x11/XmHTML/patches/patch-ab @@ -1,35 +1,25 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ +$NetBSD: patch-ab,v 1.2 1999/10/31 12:08:26 mrg Exp $ -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/XmHTML.cf XmHTML-1.1.5-hacked/XmHTML.cf -*** XmHTML-1.1.5/XmHTML.cf Thu Jan 21 14:41:49 1999 ---- XmHTML-1.1.5-hacked/XmHTML.cf Thu Jan 21 14:38:50 1999 -*************** -*** 12,19 **** - XCOMM Root of XmHTML Source Tree - XCOMM ---------------------------------------------------------------------- -- XCOMM If BUILDINCTOP is not or incorrectly set on your system, you can -- XCOMM override it here. -- XCOMM BUILDINCTOP=<path to root of the XmHTML source tree> -- XCOMM BUILDINCTOP=/home/newt/src/XmHTML/XmHTML - - XCOMM ---------------------------------------------------------------------- ---- 12,15 ---- -*************** -*** 21,28 **** - XCOMM ---------------------------------------------------------------------- - XCOMM This specifies where the XmHTML and http library will be installed -! #define XmHTMLLibDir $(USRLIBDIR) - - XCOMM This specifies where the XmHTML and http header files will be installed -! #define XmHTMLIncDir $(INCROOT)/XmHTML - - XCOMM ---------------------------------------------------------------------- ---- 17,24 ---- - XCOMM ---------------------------------------------------------------------- - XCOMM This specifies where the XmHTML and http library will be installed -! #define XmHTMLLibDir ${PREFIX}/lib - - XCOMM This specifies where the XmHTML and http header files will be installed -! #define XmHTMLIncDir ${PREFIX}/include/XmHTML - - XCOMM ---------------------------------------------------------------------- +diff -ru /tmp/XmHTML-1.1.5/book/Imakefile XmHTML-1.1.5/book/Imakefile +--- /tmp/XmHTML-1.1.5/book/Imakefile Tue Nov 11 11:11:19 1997 ++++ XmHTML-1.1.5/book/Imakefile Sun Oct 31 21:01:09 1999 +@@ -24,15 +24,15 @@ + XCOMM + + #if DebugLibXmHTML +- XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML_d.a ++ XMHTMLLIB = $(TOP)/src/libXmHTML_d.a + #else + #if SharedLibXmHTML +- XMHTMLLIB = -L$(BUILDINCTOP)/src -lXmHTML ++ XMHTMLLIB = -L$(TOP)/src -lXmHTML + #else +- XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML.a ++ XMHTMLLIB = $(TOP)/src/libXmHTML.a + #endif + #endif +-XCOMM INCLUDES = -I$(BUILDINCTOP)/src $(DMALLOCINC) ++XCOMM INCLUDES = -I$(TOP)/src $(DMALLOCINC) + DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) + + XCOMM required libraries diff --git a/x11/XmHTML/patches/patch-ac b/x11/XmHTML/patches/patch-ac index 8bae7649b24..6716c24511c 100644 --- a/x11/XmHTML/patches/patch-ac +++ b/x11/XmHTML/patches/patch-ac @@ -1,54 +1,43 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ +$NetBSD: patch-ac,v 1.2 1999/10/31 12:08:27 mrg Exp $ -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/http/Imakefile XmHTML-1.1.5-hacked/http/Imakefile -*** XmHTML-1.1.5/http/Imakefile Fri Jan 16 20:56:33 1998 ---- XmHTML-1.1.5-hacked/http/Imakefile Thu Jan 21 16:27:32 1999 -*************** -*** 82,87 **** - OBJS = HTTP.o cookie.o - -- INSTALLFLAGS = $(INSTINCFLAGS) -- - #define DoSharedLib SharedLibXmHTML - #define DoNormalLib NormalLibXmHTML ---- 82,85 ---- -*************** -*** 175,179 **** - - XCOMM rule to install header files -! InstallMultiple($(HEADERS),$(HTTPINCDIR)) - - DependTarget() ---- 173,177 ---- - - XCOMM rule to install header files -! InstallMultipleFlags($(HEADERS),$(HTTPINCDIR),$(INSTINCFLAGS)) - - DependTarget() -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/src/Imakefile XmHTML-1.1.5-hacked/src/Imakefile -*** XmHTML-1.1.5/src/Imakefile Thu Jan 21 16:28:56 1999 ---- XmHTML-1.1.5-hacked/src/Imakefile Thu Jan 21 16:26:25 1999 -*************** -*** 160,167 **** - SRCS = $(BASESRCS) $(GENSRCS) $(EXTRASRC) $(DEBSRC) - OBJS = $(BASEOBJS) $(GENOBJS) $(EXTRAOBJ) $(DEBOBJ) - -- INSTALLFLAGS = $(INSTINCFLAGS) -- - #define DoSharedLib SharedLibXmHTML - #define DoNormalLib NormalLibXmHTML - #define DoDebugLib DebugLibXmHTML ---- 160,165 ---- -*************** -*** 309,313 **** - - XCOMM rule to install header files -! InstallMultiple($(INSTHDRS),$(XMHTMLINCDIR)) - - depend:: $(SRCS) ---- 309,313 ---- - - XCOMM rule to install header files -! InstallMultipleFlags($(HEADERS),$(XMHTMLINCDIR),$(INSTINCFLAGS)) - - depend:: $(SRCS) +diff -ru /tmp/XmHTML-1.1.5/examples/Imakefile XmHTML-1.1.5/examples/Imakefile +--- /tmp/XmHTML-1.1.5/examples/Imakefile Fri Mar 13 09:53:27 1998 ++++ XmHTML-1.1.5/examples/Imakefile Sun Oct 31 21:01:09 1999 +@@ -24,23 +24,23 @@ + XCOMM + + #if DebugLibXmHTML +- XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML_d.a ++ XMHTMLLIB = $(TOP)/src/libXmHTML_d.a + DEPLIB = $(XMHTMLLIB) + #else + #if SharedLibXmHTML +- XMHTMLLIB = -L$(BUILDINCTOP)/src -lXmHTML ++ XMHTMLLIB = -L$(TOP)/src -lXmHTML + #else +- XMHTMLLIB = $(BUILDINCTOP)/src/libXmHTML.a ++ XMHTMLLIB = $(TOP)/src/libXmHTML.a + DEPLIB = $(XMHTMLLIB) + #endif + #endif +-XCOMM INCLUDES = -I$(BUILDINCTOP)/include $(DMALLOCINC) ++XCOMM INCLUDES = -I$(TOP)/include $(DMALLOCINC) + DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) + + XCOMM + XCOMM Richard's http client-side library (used by example_4) + XCOMM +-HTTPLIB = -L$(BUILDINCTOP)/http -lhttp ++HTTPLIB = -L$(TOP)/http -lhttp + + XCOMM required libraries + LOCAL_LIBS = $(XMHTMLLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) +@@ -54,7 +54,7 @@ + SRCS = example_1.c example_2.c example_4.c + + OBJS1 = example_1.o +-OBJS2 = example_2.o $(MOBJS) ++OBJS2 = example_2.o $(MOBJS) history.o + OBJS4 = example_4.o + + AllTarget(example_1 example_2 example_4) diff --git a/x11/XmHTML/patches/patch-ad b/x11/XmHTML/patches/patch-ad index 6747f007dce..1ee283793c0 100644 --- a/x11/XmHTML/patches/patch-ad +++ b/x11/XmHTML/patches/patch-ad @@ -1,117 +1,54 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ +$NetBSD: patch-ad,v 1.2 1999/10/31 12:08:27 mrg Exp $ -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/XmHTML.cf XmHTML-1.1.5-hacked/XmHTML.cf -*** XmHTML-1.1.5/XmHTML.cf Thu Jan 21 20:10:21 1999 ---- XmHTML-1.1.5-hacked/XmHTML.cf Thu Jan 21 19:47:39 1999 -*************** -*** 9,12 **** ---- 9,26 ---- - XCOMM See the file LICENSE for the full copyright statement. - -+ XCOMM We don't want Library.tmpl to install libraries. -+ -+ #if !defined (LibInstall) -+ # define LibInstall NO -+ # define XmHTMLLibInstall YES -+ #else -+ # if LibInstall -+ # define LibInstall NO -+ # define XmHTMLLibInstall YES -+ # else -+ # define XmHTMLLibInstall NO -+ # endif -+ #endif -+ - XCOMM ---------------------------------------------------------------------- - XCOMM Root of XmHTML Source Tree -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/http/Imakefile XmHTML-1.1.5-hacked/http/Imakefile -*** XmHTML-1.1.5/http/Imakefile Thu Jan 21 20:10:21 1999 ---- XmHTML-1.1.5-hacked/http/Imakefile Thu Jan 21 20:05:41 1999 -*************** -*** 163,172 **** - lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOHTTPLIBREV) - $(RM) $@ -! ln -s $@$(SOHTTPLIBREV) $@ - #endif /* SGIArchitecture */ - - clean:: - $(RM) lib$(LIBNAME).so - #endif /* DoSharedLib */ - - #endif /* ProjectX < 6 */ ---- 163,192 ---- - lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOHTTPLIBREV) - $(RM) $@ -! ln -s lib$(LIBNAME).so.$(SOHTTPLIBREV) $@ - #endif /* SGIArchitecture */ - - clean:: - $(RM) lib$(LIBNAME).so -+ -+ #if defined (XmHTMLLibInstall) && XmHTMLLibInstall -+ InstallSharedLibrary($(LIBNAME),$(SOHTTPLIBREV),$(HTTPLIBDIR)) -+ # if HasSharedData -+ InstallSharedLibraryData($(LIBNAME),$(SOHTTPLIBREV),$(HTTPLIBDIR)) -+ # endif -+ #endif -+ - #endif /* DoSharedLib */ -+ -+ #if defined (XmHTMLLibInstall) && XmHTMLLibInstall -+ InstallLibrary($(LIBNAME),$(HTTPLIBDIR)) -+ # if !defined (DoSharedLib) -+ # if DoProfileLib -+ InstallLibrary($(LIBNAME)_p,$(HTTPLIBDIR)) -+ # endif -+ # if DoDebugLib -+ InstallLibrary($(LIBNAME)_d,$(HTTPLIBDIR)) -+ # endif -+ # endif -+ #endif - - #endif /* ProjectX < 6 */ -diff -rc2 --exclude Makefile --exclude *.o --exclude Makefile.bak XmHTML-1.1.5/src/Imakefile XmHTML-1.1.5-hacked/src/Imakefile -*** XmHTML-1.1.5/src/Imakefile Thu Jan 21 20:10:21 1999 ---- XmHTML-1.1.5-hacked/src/Imakefile Thu Jan 21 20:07:05 1999 -*************** -*** 297,306 **** - lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOXMHTMLLIBREV) - $(RM) $@ -! ln -s $@$(SOXMHTMLLIBREV) $@ - #endif /* SGIArchitecture */ - - clean:: - $(RM) lib$(LIBNAME).so - #endif /* DoSharedLib */ - - #endif /* ProjectX < 6 */ ---- 297,325 ---- - lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOXMHTMLLIBREV) - $(RM) $@ -! ln -s lib$(LIBNAME).so.$(SOXMHTMLLIBREV) $@ - #endif /* SGIArchitecture */ - -+ #if defined (XmHTMLLibInstall) && XmHTMLLibInstall -+ InstallSharedLibrary($(LIBNAME),$(SOXMHTMLLIBREV),$(XMHTMLLIBDIR)) -+ # if HasSharedData -+ InstallSharedLibraryData($(LIBNAME),$(SOXMHTMLLIBREV),$(XHMTHMLLIBDIR)) -+ # endif -+ #endif -+ - clean:: - $(RM) lib$(LIBNAME).so - #endif /* DoSharedLib */ -+ -+ #if defined (XmHTMLLibInstall) && XmHTMLLibInstall -+ InstallLibrary($(LIBNAME),$(XMHTMLLIBDIR)) -+ # if !defined (DoSharedLib) -+ # if DoProfileLib -+ InstallLibrary($(LIBNAME)_p,$(XMHTMLLIBDIR)) -+ # endif -+ # if DoDebugLib -+ InstallLibrary($(LIBNAME)_d,$(XMHTMLLIBDIR)) -+ # endif -+ # endif -+ #endif - - #endif /* ProjectX < 6 */ +diff -ru /tmp/XmHTML-1.1.5/http/Imakefile XmHTML-1.1.5/http/Imakefile +--- /tmp/XmHTML-1.1.5/http/Imakefile Sat Jan 17 12:56:33 1998 ++++ XmHTML-1.1.5/http/Imakefile Sun Oct 31 21:01:10 1999 +@@ -81,8 +81,6 @@ + + OBJS = HTTP.o cookie.o + +-INSTALLFLAGS = $(INSTINCFLAGS) +- + #define DoSharedLib SharedLibXmHTML + #define DoNormalLib NormalLibXmHTML + #define DoDebugLib DebugLibXmHTML +@@ -164,17 +162,37 @@ + #else + lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOHTTPLIBREV) + $(RM) $@ +- ln -s $@$(SOHTTPLIBREV) $@ ++ ln -s lib$(LIBNAME).so.$(SOHTTPLIBREV) $@ + #endif /* SGIArchitecture */ + + clean:: + $(RM) lib$(LIBNAME).so ++ ++#if defined (XmHTMLLibInstall) && XmHTMLLibInstall ++InstallSharedLibrary($(LIBNAME),$(SOHTTPLIBREV),$(HTTPLIBDIR)) ++# if HasSharedData ++InstallSharedLibraryData($(LIBNAME),$(SOHTTPLIBREV),$(HTTPLIBDIR)) ++# endif ++#endif ++ + #endif /* DoSharedLib */ + ++#if defined (XmHTMLLibInstall) && XmHTMLLibInstall ++InstallLibrary($(LIBNAME),$(HTTPLIBDIR)) ++# if !defined (DoSharedLib) ++# if DoProfileLib ++InstallLibrary($(LIBNAME)_p,$(HTTPLIBDIR)) ++# endif ++# if DoDebugLib ++InstallLibrary($(LIBNAME)_d,$(HTTPLIBDIR)) ++# endif ++# endif ++#endif ++ + #endif /* ProjectX < 6 */ + + XCOMM rule to install header files +-InstallMultiple($(HEADERS),$(HTTPINCDIR)) ++InstallMultipleFlags($(HEADERS),$(HTTPINCDIR),$(INSTINCFLAGS)) + + DependTarget() + diff --git a/x11/XmHTML/patches/patch-ae b/x11/XmHTML/patches/patch-ae new file mode 100644 index 00000000000..0d244b9e7d2 --- /dev/null +++ b/x11/XmHTML/patches/patch-ae @@ -0,0 +1,62 @@ +$NetBSD: patch-ae,v 1.1 1999/10/31 12:08:27 mrg Exp $ + +diff -ru /tmp/XmHTML-1.1.5/src/Imakefile XmHTML-1.1.5/src/Imakefile +--- /tmp/XmHTML-1.1.5/src/Imakefile Fri Jun 5 00:52:46 1998 ++++ XmHTML-1.1.5/src/Imakefile Sun Oct 31 21:01:10 1999 +@@ -107,7 +107,7 @@ + + XCOMM + XCOMM Header files used by various other targets in the XmHTML source tree +-PUBHDRS = XmHTMLfuncs.h LZWStream.h XCC.h miniparse.h stack.h ++PUBHDRS = XmHTMLfuncs.h LZWStream.h XCC.h miniparse.h stack.h icons.h + + XCOMM + XCOMM Header files generated during compilation (via mkStrings) +@@ -160,8 +160,6 @@ + SRCS = $(BASESRCS) $(GENSRCS) $(EXTRASRC) $(DEBSRC) + OBJS = $(BASEOBJS) $(GENOBJS) $(EXTRAOBJ) $(DEBOBJ) + +-INSTALLFLAGS = $(INSTINCFLAGS) +- + #define DoSharedLib SharedLibXmHTML + #define DoNormalLib NormalLibXmHTML + #define DoDebugLib DebugLibXmHTML +@@ -298,17 +296,36 @@ + #else + lib$(LIBNAME).so: lib$(LIBNAME).so.$(SOXMHTMLLIBREV) + $(RM) $@ +- ln -s $@$(SOXMHTMLLIBREV) $@ ++ ln -s lib$(LIBNAME).so.$(SOXMHTMLLIBREV) $@ + #endif /* SGIArchitecture */ + ++#if defined (XmHTMLLibInstall) && XmHTMLLibInstall ++InstallSharedLibrary($(LIBNAME),$(SOXMHTMLLIBREV),$(XMHTMLLIBDIR)) ++# if HasSharedData ++InstallSharedLibraryData($(LIBNAME),$(SOXMHTMLLIBREV),$(XHMTHMLLIBDIR)) ++# endif ++#endif ++ + clean:: + $(RM) lib$(LIBNAME).so + #endif /* DoSharedLib */ + ++#if defined (XmHTMLLibInstall) && XmHTMLLibInstall ++InstallLibrary($(LIBNAME),$(XMHTMLLIBDIR)) ++# if !defined (DoSharedLib) ++# if DoProfileLib ++InstallLibrary($(LIBNAME)_p,$(XMHTMLLIBDIR)) ++# endif ++# if DoDebugLib ++InstallLibrary($(LIBNAME)_d,$(XMHTMLLIBDIR)) ++# endif ++# endif ++#endif ++ + #endif /* ProjectX < 6 */ + + XCOMM rule to install header files +-InstallMultiple($(INSTHDRS),$(XMHTMLINCDIR)) ++InstallMultipleFlags($(HEADERS),$(XMHTMLINCDIR),$(INSTINCFLAGS)) + + depend:: $(SRCS) + diff --git a/x11/XmHTML/patches/patch-af b/x11/XmHTML/patches/patch-af new file mode 100644 index 00000000000..53453af5619 --- /dev/null +++ b/x11/XmHTML/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 1999/10/31 12:08:27 mrg Exp $ + +diff -ru /tmp/XmHTML-1.1.5/src/parse.c XmHTML-1.1.5/src/parse.c +--- /tmp/XmHTML-1.1.5/src/parse.c Fri Sep 11 06:46:38 1998 ++++ XmHTML-1.1.5/src/parse.c Sun Oct 31 21:01:09 1999 +@@ -138,7 +138,7 @@ + #define XmHTML_STRINGDEFINES + #include <XmHTML/HTMLWarnings.h> + #undef XmHTML_STRINGDEFINES +-#include "icons.h" /* W3C Working Draft WD-wwwicn-960729 */ ++#include <XmHTML/icons.h> + #else + #include "toolkit.h" + #include XmHTMLPrivateHeader diff --git a/x11/XmHTML/patches/patch-ag b/x11/XmHTML/patches/patch-ag new file mode 100644 index 00000000000..8084745751d --- /dev/null +++ b/x11/XmHTML/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 1999/10/31 12:08:28 mrg Exp $ + +diff -ru /tmp/XmHTML-1.1.5/tools/Imakefile XmHTML-1.1.5/tools/Imakefile +--- /tmp/XmHTML-1.1.5/tools/Imakefile Thu Dec 11 15:10:42 1997 ++++ XmHTML-1.1.5/tools/Imakefile Sun Oct 31 21:01:10 1999 +@@ -20,7 +20,7 @@ + #include <Motif.tmpl> + #endif + +-EXTRA_INCLUDES = -I. -I$(BUILDINCTOP)/include ++EXTRA_INCLUDES = -I. -I$(TOP)/include + + XCOMM dependency X libraries, required for reptype + XDEPLIB = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) |