head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.54 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.52 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.50 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.48 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.46 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.44 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.42 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.40 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.38 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.36 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.34 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.32 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.30 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.28 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.26 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.24 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.22 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.20 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.18 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.16 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.14 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.12 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.10 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.8 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.4 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.6 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.2 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.5.0.82 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.80 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.78 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.76 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.74 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.72 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.70 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.68 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.64 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.62 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.60 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.58 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.56 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.54 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.52 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.50 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.48 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.46 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.44 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.42 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.40 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.38 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.36 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.34 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.32 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.30 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.28 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.26 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.24 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.22 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.18 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.16 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.14 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.12 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.10 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.8 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.4.0.58 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.56 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.54 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.52 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.50 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.48 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.46 pkgsrc-2008Q1:1.4.0.44 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.42 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.40 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.38 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.36 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.34 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.32 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.30 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.28 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.26 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.24 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.22 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.20 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.18 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 netbsd-1-4-RELEASE:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2019.09.06.08.46.26; author nros; state Exp; branches; next 1.5; commitid JvxlYbI47OLqFVBB; 1.5 date 2009.09.08.19.20.49; author joerg; state Exp; branches; next 1.4; 1.4 date 2001.03.05.13.52.42; author skrll; state Exp; branches; next 1.3; 1.3 date 99.11.13.07.31.40; author jlam; state Exp; branches; next 1.2; 1.2 date 99.10.31.12.08.27; author mrg; state Exp; branches; next 1.1; 1.1 date 99.01.22.06.27.04; author mellon; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.01.22.06.27.04; author mellon; state Exp; branches; next ; desc @@ 1.6 log @Updated xmhtml to version 1.1.0 This version has a real master site and homepage at sourceforge. Includes updates for buildling with the latest png api and fixes to debug.c (patch-ai). Removed the patches for this. Removed patch-ab, patch-ac and patch-ae because we only build the lib. Other updates upstream: Support for utf-8 text and xft. Function XmHTMLScrollToYPos added. Fixes for crashes and various memory leaks. @ text @$NetBSD: patch-ad,v 1.5 2009/09/08 19:20:49 joerg Exp $ * use libtool --- lib/Makefile.orig 2015-10-26 10:22:55.000000000 +0000 +++ lib/Makefile @@@@ -25,18 +25,18 @@@@ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ############################################################################## # -LIBRARY=libXmHTML.a +LIBRARY=libXmHTML.la SHAREDLIB=libXmHTML.so.$(ARCHIVE) # Targets to make -TARGET_STATIC=$(LIBRARY) +TARGET=$(LIBRARY) TARGET_SHARED=$(SHAREDLIB) # Subdirectories to visit SUBDIRS= common $(TOOLKIT) # Target rules -all:: $(TARGET_STATIC) $(TARGET_SHARED) +all:: $(TARGET) # Separate rules for all targets $(TOOLKIT):: @@@@ -45,10 +45,11 @@@@ $(TOOLKIT):: common:: @@(set -x; cd common; $(MAKE) all $(pass_flags) ) -$(TARGET_STATIC):: common $(TOOLKIT) - $(RM) $@@ \ - $(AR) $@@ common/*.o $(TOOLKIT)/*.o - $(RANLIB) $@@ +$(TARGET):: common $(TOOLKIT) + $(RM) $@@ + ${LIBTOOL} --mode=link $(CC) -o $@@ $(sort $(wildcard common/*.lo)) \ + $(sort $(wildcard $(TOOLKIT)/*.lo)) \ + -rpath $(PREFIX)/lib -version-info 2:0:1 $(TARGET_SHARED):: common $(TOOLKIT) $(RM) $@@ ; \ @ 1.5 log @Use libtool --mode=XXX in all cases. @ text @d1 3 a3 3 $NetBSD: patch-ad,v 1.4 2001/03/05 13:52:42 skrll Exp $ --- lib/Makefile.orig Thu Feb 4 00:43:26 1999 d5 1 a5 1 @@@@ -25,7 +25,7 @@@@ d11 1 d13 16 a28 3 # Target to make TARGET=$(LIBRARY) @@@@ -44,9 +44,9 @@@@ d31 1 a31 1 $(TARGET):: common $(PLATFORM) d33 1 a33 1 - $(AR) $@@ common/*.o $(PLATFORM)/*.o d35 1 d37 6 a42 5 + ${LIBTOOL} --mode=link $(CC) -o $@@ common/*.lo $(PLATFORM)/*.lo \ + -rpath ${PREFIX}/lib -version-info 1:2 depend:: @@( for dir in $(SUBDIRS) ; do \ @ 1.4 log @Add definition of CC to make environment and get build system to use it with libtool. @ text @d1 1 a1 1 $NetBSD$ d22 1 a22 1 + ${LIBTOOL} $(CC) -o $@@ common/*.lo $(PLATFORM)/*.lo \ @ 1.3 log @* 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. @ text @d3 2 a4 2 --- lib/Makefile.orig Wed Feb 3 19:43:26 1999 +++ lib/Makefile Tue Nov 2 01:28:54 1999 d22 1 a22 1 + $(CC) -o $@@ common/*.lo $(PLATFORM)/*.lo \ @ 1.2 log @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! @ text @d3 24 a26 52 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() @ 1.1 log @Initial revision @ text @d3 52 a54 115 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 */ @ 1.1.1.1 log @XmHTML: a Motif-based HTML display widget. @ text @@