diff options
author | mellon <mellon@pkgsrc.org> | 1999-01-22 06:27:03 +0000 |
---|---|---|
committer | mellon <mellon@pkgsrc.org> | 1999-01-22 06:27:03 +0000 |
commit | 1c68bf98d2a63ec62034cfe702713221bd4a0424 (patch) | |
tree | fb41f70050360b5aab40b433bf8b9f7881835f83 /x11/XmHTML/patches | |
parent | 33937c40177638dd070bde4472178efb1e2337eb (diff) | |
download | pkgsrc-1c68bf98d2a63ec62034cfe702713221bd4a0424.tar.gz |
XmHTML: a Motif-based HTML display widget.
Diffstat (limited to 'x11/XmHTML/patches')
-rw-r--r-- | x11/XmHTML/patches/patch-aa | 231 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ab | 35 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ac | 54 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ad | 117 |
4 files changed, 437 insertions, 0 deletions
diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa new file mode 100644 index 00000000000..a4642803dc4 --- /dev/null +++ b/x11/XmHTML/patches/patch-aa @@ -0,0 +1,231 @@ +$NetBSD: patch-aa,v 1.1.1.1 1999/01/22 06:27:04 mellon 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 --git a/x11/XmHTML/patches/patch-ab b/x11/XmHTML/patches/patch-ab new file mode 100644 index 00000000000..0ed26ac6857 --- /dev/null +++ b/x11/XmHTML/patches/patch-ab @@ -0,0 +1,35 @@ +$NetBSD: patch-ab,v 1.1.1.1 1999/01/22 06:27:04 mellon 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 --git a/x11/XmHTML/patches/patch-ac b/x11/XmHTML/patches/patch-ac new file mode 100644 index 00000000000..8bae7649b24 --- /dev/null +++ b/x11/XmHTML/patches/patch-ac @@ -0,0 +1,54 @@ +$NetBSD: patch-ac,v 1.1.1.1 1999/01/22 06:27:04 mellon 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 --git a/x11/XmHTML/patches/patch-ad b/x11/XmHTML/patches/patch-ad new file mode 100644 index 00000000000..6747f007dce --- /dev/null +++ b/x11/XmHTML/patches/patch-ad @@ -0,0 +1,117 @@ +$NetBSD: patch-ad,v 1.1.1.1 1999/01/22 06:27:04 mellon 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 */ |