diff options
author | jlam <jlam@pkgsrc.org> | 1999-11-13 07:31:39 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 1999-11-13 07:31:39 +0000 |
commit | 497b60f0d4b03f870d80b5b9057c0bf68cf4950a (patch) | |
tree | 96e4cd0700204dfb773fa458bdb598d9ce8e4fe3 /x11/XmHTML | |
parent | 86ee38e51c38883d3391c0023cf7dba011baece4 (diff) | |
download | pkgsrc-497b60f0d4b03f870d80b5b9057c0bf68cf4950a.tar.gz |
* Update XmHTML to 1.1.7.
* The build process no longer supports imake, so throw out all the old patches; we need to patch the new Makefiles.
* Don't install the HTTP 1.0 client library, since it isn't needed by XmHTML,
and there are better HTTP libraries available.
* We correctly support ELF, so this closes PR#8028.
Diffstat (limited to 'x11/XmHTML')
-rw-r--r-- | x11/XmHTML/Makefile | 15 | ||||
-rw-r--r-- | x11/XmHTML/files/md5 | 4 | ||||
-rw-r--r-- | x11/XmHTML/files/patch-sum | 14 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-aa | 141 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ab | 36 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ac | 58 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ad | 74 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ae | 69 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-af | 14 | ||||
-rw-r--r-- | x11/XmHTML/patches/patch-ag | 14 | ||||
-rw-r--r-- | x11/XmHTML/pkg/COMMENT | 2 | ||||
-rw-r--r-- | x11/XmHTML/pkg/DESCR | 36 | ||||
-rw-r--r-- | x11/XmHTML/pkg/PLIST | 29 |
13 files changed, 189 insertions, 317 deletions
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile index 6d1aed8acde..56a856e201f 100644 --- a/x11/XmHTML/Makefile +++ b/x11/XmHTML/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 1999/11/07 17:25:31 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 1999/11/13 07:31:39 jlam Exp $ # -DISTNAME= XmHTML-1.1.5 +DISTNAME= XmHTML-1.1.7 CATEGORIES= x11 MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/ @@ -14,8 +14,15 @@ DEPENDS+= png-1.0.3:../../graphics/png USE_X11= yes USE_MOTIF= yes +USE_GMAKE= yes +USE_LIBTOOL= yes -do-configure: - @(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF}) +NO_CONFIGURE= yes + +do-install: + ${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \ + ${WRKSRC}/lib/libXmHTML.la ${PREFIX}/lib + ${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML + ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML .include "../../mk/bsd.pkg.mk" diff --git a/x11/XmHTML/files/md5 b/x11/XmHTML/files/md5 index 3685e33fae7..c0a785737b0 100644 --- a/x11/XmHTML/files/md5 +++ b/x11/XmHTML/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ +$NetBSD: md5,v 1.2 1999/11/13 07:31:39 jlam Exp $ -MD5 (XmHTML-1.1.5.tar.gz) = 7797a9f8e49bd4c1b8ad5edd1fbad996 +MD5 (XmHTML-1.1.7.tar.gz) = 6d079435fb954bb7878f4dd0d3f7b8d8 diff --git a/x11/XmHTML/files/patch-sum b/x11/XmHTML/files/patch-sum index c076fba5ac2..312a55fd696 100644 --- a/x11/XmHTML/files/patch-sum +++ b/x11/XmHTML/files/patch-sum @@ -1,9 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/10/31 12:08:25 mrg Exp $ +$NetBSD: patch-sum,v 1.3 1999/11/13 07:31:39 jlam Exp $ -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 +MD5 (patch-aa) = 94000be72176de16682f5680b59478c4 +MD5 (patch-ab) = d3817484fffe2e00a011b8d884990b9b +MD5 (patch-ac) = cf9669603682d262a597a9e358f0ba05 +MD5 (patch-ad) = 3383a75d041e5c76ce2d8001eaa9e96b +MD5 (patch-ae) = 91a3e7d1bfb4fa1ba46e03e7b81c821c diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa index 76538bca740..b740386b5f6 100644 --- a/x11/XmHTML/patches/patch-aa +++ b/x11/XmHTML/patches/patch-aa @@ -1,97 +1,66 @@ -$NetBSD: patch-aa,v 1.2 1999/10/31 12:08:26 mrg Exp $ +$NetBSD: patch-aa,v 1.3 1999/11/13 07:31:40 jlam Exp $ -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. +--- Makefile.orig Wed Feb 3 19:43:27 1999 ++++ Makefile Tue Nov 2 01:28:54 1999 +@@ -64,9 +64,9 @@ + # Compiler Settings # + # # + ##################### +-CC = gcc +-CFLAGS = -g -funroll-loops -Wall -pipe -ansi +-LDFLAGS = ++CC = $(LIBTOOL) gcc ++#CFLAGS = -g -funroll-loops -Wall -pipe -ansi ++#LDFLAGS = -+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 + # The following flags are *very* usefull if you are getting unresolved + # references to functions in libraries that you *know* to exist. +@@ -114,8 +114,8 @@ + # HAVE_LIBPNG => png.h and zlib.h + # HAVE_LIBZ => zlib.h - XCOMM ---------------------------------------------------------------------- - XCOMM Installation Directories - XCOMM ---------------------------------------------------------------------- - XCOMM This specifies where the XmHTML and http library will be installed --#define XmHTMLLibDir $(USRLIBDIR) -+#define XmHTMLLibDir ${PREFIX}/lib +-ZLIBINC = +-IMAGEINCLUDES = $(ZLIBINC) ++ZLIBINC = ++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC) - XCOMM This specifies where the XmHTML and http header files will be installed --#define XmHTMLIncDir $(INCROOT)/XmHTML -+#define XmHTMLIncDir ${PREFIX}/include/XmHTML + # Image libraries + # No need to add -lXpm if you need to include it with LIBS below +@@ -166,14 +166,14 @@ + # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more + # info). + # +-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) ++CPPFLAGS = -DHAVE_REGEX_H $(IMAGEDEFINES) - 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 + # Various include directories + LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common - 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 + # Platform specific includes + ifeq ($(PLATFORM),Motif) +-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include ++PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include + else + ifeq ($(PLATFORM),gtk) + PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include +@@ -192,17 +192,17 @@ + # Motif version (default) + ifeq ($(PLATFORM),Motif) - #define IHaveJPEG YES --JPEGINC = --JPEGLIB = -ljpeg -+JPEGINC = -I${PREFIX}/include -+JPEGLIB = -L${PREFIX}/lib -ljpeg +-LIBDIR = -L/usr/X11R6/lib ++LIBDIR = -L${X11BASE}/lib + # This is what is required under Linux (Motif 2.0.1). + # Your mileage may vary. +-LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ++LIBS = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE - 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 + else - #define IHavePNG YES --PNGINC = --PNGLIB = -lpng -+PNGINC = -I${PREFIX}/include -+PNGLIB = -L${PREFIX}/lib -lpng + # gtk version (only supported port for now) + ifeq($(PLATFORM),gtk) - 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 +-LIBDIR = -L/usr/local/lib ++LIBDIR = -L${X11BASE}/lib + LIBS = -lgdk -lgtk -lX11 + # endif gtk diff --git a/x11/XmHTML/patches/patch-ab b/x11/XmHTML/patches/patch-ab index e299be625e5..7d6b8e3bedd 100644 --- a/x11/XmHTML/patches/patch-ab +++ b/x11/XmHTML/patches/patch-ab @@ -1,25 +1,17 @@ -$NetBSD: patch-ab,v 1.2 1999/10/31 12:08:26 mrg Exp $ +$NetBSD: patch-ab,v 1.3 1999/11/13 07:31:40 jlam Exp $ -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 +--- examples/Makefile.orig Wed Feb 3 19:43:27 1999 ++++ examples/Makefile Tue Nov 2 01:39:14 1999 +@@ -11,10 +11,10 @@ + EXAMPLES=example_1 example_2 example_4 - #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) + # The XmHTML library +-XMHTMLLIB = -L../lib -lXmHTML ++XMHTMLLIB = ../lib/libXmHTML.la - XCOMM required libraries + # Richard Offer's http client-side library +-HTTPLIB = -L../http -lhttp ++HTTPLIB = ../http/libhttp.la + + # Libraries against which all examples are linked + LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB) diff --git a/x11/XmHTML/patches/patch-ac b/x11/XmHTML/patches/patch-ac index 6716c24511c..bb3c2f58f83 100644 --- a/x11/XmHTML/patches/patch-ac +++ b/x11/XmHTML/patches/patch-ac @@ -1,43 +1,25 @@ -$NetBSD: patch-ac,v 1.2 1999/10/31 12:08:27 mrg Exp $ +$NetBSD: patch-ac,v 1.3 1999/11/13 07:31:40 jlam Exp $ -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 +--- http/Makefile.orig Wed Feb 3 19:43:27 1999 ++++ http/Makefile Tue Nov 2 01:28:54 1999 +@@ -2,7 +2,7 @@ + # lint configuration. I use lclint. + # - #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) +-LIBRARY=libhttp.a ++LIBRARY=libhttp.la - XCOMM - XCOMM Richard's http client-side library (used by example_4) - XCOMM --HTTPLIB = -L$(BUILDINCTOP)/http -lhttp -+HTTPLIB = -L$(TOP)/http -lhttp + # List of source, object and header files + SRCS=HTTP.c cookie.c +@@ -27,9 +27,8 @@ + # targets to build - XCOMM required libraries - LOCAL_LIBS = $(XMHTMLLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) -@@ -54,7 +54,7 @@ - SRCS = example_1.c example_2.c example_4.c + $(TARGET):: $(OBJS) +- $(RM) $@ \ +- $(AR) $@ $(OBJS) +- $(RANLIB) $@ ++ $(RM) $@ ++ $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2 - 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) + stamp-includes: + @if [ -d ../include ]; then set +x; \ diff --git a/x11/XmHTML/patches/patch-ad b/x11/XmHTML/patches/patch-ad index 1ee283793c0..de87a3996cc 100644 --- a/x11/XmHTML/patches/patch-ad +++ b/x11/XmHTML/patches/patch-ad @@ -1,54 +1,26 @@ -$NetBSD: patch-ad,v 1.2 1999/10/31 12:08:27 mrg Exp $ +$NetBSD: patch-ad,v 1.3 1999/11/13 07:31:40 jlam Exp $ -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 @@ +--- lib/Makefile.orig Wed Feb 3 19:43:26 1999 ++++ lib/Makefile Tue Nov 2 01:28:54 1999 +@@ -25,7 +25,7 @@ + # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # + ############################################################################## + # +-LIBRARY=libXmHTML.a ++LIBRARY=libXmHTML.la - 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() + # Target to make + TARGET=$(LIBRARY) +@@ -44,9 +44,9 @@ + @(set -x; cd common; $(MAKE) all $(pass_flags) ) + $(TARGET):: common $(PLATFORM) +- $(RM) $@ \ +- $(AR) $@ common/*.o $(PLATFORM)/*.o +- $(RANLIB) $@ ++ $(RM) $@ ++ $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \ ++ -rpath ${PREFIX}/lib -version-info 1:2 + + depend:: + @( for dir in $(SUBDIRS) ; do \ diff --git a/x11/XmHTML/patches/patch-ae b/x11/XmHTML/patches/patch-ae index 0d244b9e7d2..7d949e726e1 100644 --- a/x11/XmHTML/patches/patch-ae +++ b/x11/XmHTML/patches/patch-ae @@ -1,62 +1,13 @@ -$NetBSD: patch-ae,v 1.1 1999/10/31 12:08:27 mrg Exp $ +$NetBSD: patch-ae,v 1.2 1999/11/13 07:31:40 jlam 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 @@ +--- tools/Makefile.orig Wed Feb 3 19:43:27 1999 ++++ tools/Makefile Tue Nov 2 01:38:36 1999 +@@ -88,7 +88,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) + httpget:: httpget.o + $(RM) $@ \ +- $(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB) ++ $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB) + # gif to gzf converter + gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o diff --git a/x11/XmHTML/patches/patch-af b/x11/XmHTML/patches/patch-af deleted file mode 100644 index 53453af5619..00000000000 --- a/x11/XmHTML/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$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 deleted file mode 100644 index 8084745751d..00000000000 --- a/x11/XmHTML/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$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) diff --git a/x11/XmHTML/pkg/COMMENT b/x11/XmHTML/pkg/COMMENT index f4e45198596..bbfc45b071f 100644 --- a/x11/XmHTML/pkg/COMMENT +++ b/x11/XmHTML/pkg/COMMENT @@ -1 +1 @@ -Motif-based HTML Widget library +Motif Widget capable of displaying HTML 3.2 conforming text diff --git a/x11/XmHTML/pkg/DESCR b/x11/XmHTML/pkg/DESCR index f4e45198596..25ffc681a1b 100644 --- a/x11/XmHTML/pkg/DESCR +++ b/x11/XmHTML/pkg/DESCR @@ -1 +1,35 @@ -Motif-based HTML Widget library +XmHTML, a high performance Motif Widget capable of displaying HTML 3.2 +conforming text. Amongst it's many features are the following: + * builtin image support for X11 bitmaps, X11 pixmaps, GIF87a, GIF89a, + JPEG and PNG; + * GIF images are decoded using a patent free scheme; + * builtin support for animated GIF89a and animated GIF89a with NETSCAPE2.0 + loop extension. XmHTML supports + * all GIF89a disposal methods; + * image support covers all X11 visual types and display depths; + * delayed image loading; + * progressive image loading; + * builtin scrolling interface (both keyboard and mouse); + * anchors can be displayed as pushbuttons; + * anchor can be highlighted for enhanced visual feedback; + * autosizing; + * capable of displaying text/html, text/plain and standalone images; + * supports the full HTML 3.2 standard; as well as the HTML 4.0 <FRAMESET> + tags; + * an extensive set of callback resources; + * full text justification; + * smart and user-definable font mapping; + * can work with a predefined palette (which it can even create for you); + * builtin quantizer using Floyd-Steinberg error diffusion; + * four different dithering methods allow one to achieve an optimum + balance between performance and image quality; + * HTML Table support; + * Support for HTML4.0 Events; + * fully compatible with LessTif + +XmBalloon, a very lightweight "tooltip" Widget to show a one-line string +in a small popup-window. Features include the following: + * Choose between a rectangular or shaped window; + * Popup window can be transparent; + * User-configurable Popup and popdown delays; + * very easy to use; diff --git a/x11/XmHTML/pkg/PLIST b/x11/XmHTML/pkg/PLIST index 1319e22ce8d..db98f9e3418 100644 --- a/x11/XmHTML/pkg/PLIST +++ b/x11/XmHTML/pkg/PLIST @@ -1,22 +1,17 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/01/22 06:27:04 mellon Exp $ -include/XmHTML/XmHTML.h -include/XmHTML/XmHTMLP.h -include/XmHTML/XmHTMLI.h -include/XmHTML/HTML.h +@comment $NetBSD: PLIST,v 1.2 1999/11/13 07:31:40 jlam Exp $ include/XmHTML/Balloon.h include/XmHTML/BalloonP.h +include/XmHTML/HTML.h include/XmHTML/HTMLStrings.h -include/XmHTML/HTTP.h -include/XmHTML/HTTPP.h -include/XmHTML/HTMLWarnings.h -include/XmHTML/XmHTMLfuncs.h -include/XmHTML/LZWStream.h include/XmHTML/XCC.h -include/XmHTML/miniparse.h -include/XmHTML/stack.h -include/XmHTML/icons.h -@dirrm include/XmHTML -lib/libXmHTML.so.1.1.5 -lib/libhttp.so.0.1.1 +include/XmHTML/XCCP.h +include/XmHTML/XmHTML.h +include/XmHTML/XmHTMLP.h +include/XmHTML/XmHTMLfuncs.h +include/XmHTML/debug_menu.h +include/XmHTML/resources.h +include/XmHTML/tka.h +include/XmHTML/toolkit.h lib/libXmHTML.a -lib/libhttp.a +lib/libXmHTML.so.1.2 +@dirrm include/XmHTML |