Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv6133/stable/main/finkinfo/x11
Added Files:
xmhtml.info xmhtml.patch
Log Message:
xmhtml to stable
--- NEW FILE: xmhtml.patch ---
diff -Nurd '-x*~' XmHTML-1.1.7.orig/Makefile XmHTML-1.1.7/Makefile
--- XmHTML-1.1.7.orig/Makefile 1999-02-03 19:43:27.000000000 -0500
+++ XmHTML-1.1.7/Makefile 2011-09-07 07:06:56.000000000 -0400
@@ -40,7 +40,7 @@
# remove the examples directory from this line.
# If you want to build the XmHTML tutorial examples, add the book directory.
-SUBDIRS= lib http examples tools
+SUBDIRS= lib
# some common definitions
#
@@ -64,8 +64,8 @@
# Compiler Settings #
# #
#####################
-CC = gcc
-CFLAGS = -g -funroll-loops -Wall -pipe -ansi
+CC = cc -fno-common
+CFLAGS = -g -funroll-loops -Wall -pipe -ansi -MD
LDFLAGS =
# The following flags are *very* usefull if you are getting unresolved
@@ -115,7 +115,7 @@
# HAVE_LIBZ => zlib.h
ZLIBINC =
-IMAGEINCLUDES = $(ZLIBINC)
+IMAGEINCLUDES = -I@prefix@/include $(ZLIBINC)
# 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_STRINGS_H -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE
-D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES)
# Various include directories
LIBINC=-I. -I../include -I../include/common -I../../include
-I../../include/common
# Platform specific includes
ifeq ($(PLATFORM),Motif)
-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
+PLATFORMINC=-I../../include/XmHTML -I@prefix@/include -I/usr/X11R6/include
else
ifeq ($(PLATFORM),gtk)
PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -192,7 +192,7 @@
# Motif version (default)
ifeq ($(PLATFORM),Motif)
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L@prefix@/lib -L/usr/X11R6/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
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/XmHTML.c
XmHTML-1.1.7/lib/Motif/XmHTML.c
--- XmHTML-1.1.7.orig/lib/Motif/XmHTML.c 1999-01-11 19:42:36.000000000
-0500
+++ XmHTML-1.1.7/lib/Motif/XmHTML.c 2011-09-07 07:14:23.000000000 -0400
@@ -112,6 +112,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
#include <X11/IntrinsicP.h> /* Fast macros */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/forms.c
XmHTML-1.1.7/lib/Motif/forms.c
--- XmHTML-1.1.7.orig/lib/Motif/forms.c 1998-10-13 18:14:56.000000000 -0400
+++ XmHTML-1.1.7/lib/Motif/forms.c 2011-09-07 07:21:21.000000000 -0400
@@ -73,6 +73,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
/* motif includes */
#include <Xm/DrawnB.h>
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/Motif/frames.c
XmHTML-1.1.7/lib/Motif/frames.c
--- XmHTML-1.1.7.orig/lib/Motif/frames.c 1998-11-16 17:04:12.000000000
-0500
+++ XmHTML-1.1.7/lib/Motif/frames.c 2011-09-07 07:15:56.000000000 -0400
@@ -77,6 +77,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "toolkit.h"
#include XmHTMLPrivateHeader
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/LZWStream.c
XmHTML-1.1.7/lib/common/LZWStream.c
--- XmHTML-1.1.7.orig/lib/common/LZWStream.c 1998-11-16 11:38:26.000000000
-0500
+++ XmHTML-1.1.7/lib/common/LZWStream.c 2011-09-07 07:38:24.000000000 -0400
@@ -725,10 +725,12 @@
#ifdef DEBUG
char *chPtr = getenv("LZW_DEBUG");
- if(chPtr == '1')
+ if(chPtr) {
+ if(*chPtr == '1')
lzw_debug = 1;
- else if(chPtr == '2')
+ else if(*chPtr == '2')
lzw_debug = 2;
+ }
#endif
/* no error */
lzw->err_msg = NULL;
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/StringUtil.c
XmHTML-1.1.7/lib/common/StringUtil.c
--- XmHTML-1.1.7.orig/lib/common/StringUtil.c 1998-12-10 18:21:46.000000000
-0500
+++ XmHTML-1.1.7/lib/common/StringUtil.c 2011-09-07 07:18:00.000000000
-0400
@@ -84,6 +84,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h> /* toupper, tolower, isspace */
#include <sys/types.h>
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/callbacks.c
XmHTML-1.1.7/lib/common/callbacks.c
--- XmHTML-1.1.7.orig/lib/common/callbacks.c 1998-12-13 06:59:41.000000000
-0500
+++ XmHTML-1.1.7/lib/common/callbacks.c 2011-09-07 07:17:50.000000000 -0400
@@ -90,6 +90,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
/* Local includes */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/colors.c
XmHTML-1.1.7/lib/common/colors.c
--- XmHTML-1.1.7.orig/lib/common/colors.c 1998-11-16 12:22:29.000000000
-0500
+++ XmHTML-1.1.7/lib/common/colors.c 2011-09-07 07:17:01.000000000 -0400
@@ -90,6 +90,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
#include "toolkit.h"
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/debug.c
XmHTML-1.1.7/lib/common/debug.c
--- XmHTML-1.1.7.orig/lib/common/debug.c 1998-10-06 15:58:00.000000000
-0400
+++ XmHTML-1.1.7/lib/common/debug.c 2011-09-07 06:49:40.000000000 -0400
@@ -110,7 +110,7 @@
/*** Private Function Prototype Declarations ****/
/*** Private Variable Declarations ***/
-static FILE *__rsd_debug_file = stdout;
+static FILE *__rsd_debug_file; /**= stdout;**/
/*****
* When debug output is send to a file, we register an exit func to close
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/format.c
XmHTML-1.1.7/lib/common/format.c
--- XmHTML-1.1.7.orig/lib/common/format.c 1999-01-19 22:49:38.000000000
-0500
+++ XmHTML-1.1.7/lib/common/format.c 2011-09-07 07:15:34.000000000 -0400
@@ -116,6 +116,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h> /* isspace, tolower */
/* Local includes */
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/map.c
XmHTML-1.1.7/lib/common/map.c
--- XmHTML-1.1.7.orig/lib/common/map.c 1998-10-13 18:10:57.000000000 -0400
+++ XmHTML-1.1.7/lib/common/map.c 2011-09-07 07:18:12.000000000 -0400
@@ -78,6 +78,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
#include "toolkit.h"
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/parse.c
XmHTML-1.1.7/lib/common/parse.c
--- XmHTML-1.1.7.orig/lib/common/parse.c 1999-01-20 00:13:08.000000000
-0500
+++ XmHTML-1.1.7/lib/common/parse.c 2011-09-07 07:18:22.000000000 -0400
@@ -120,6 +120,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
/*****
diff -Nurd '-x*~' XmHTML-1.1.7.orig/lib/common/public.c
XmHTML-1.1.7/lib/common/public.c
--- XmHTML-1.1.7.orig/lib/common/public.c 1999-01-19 11:53:52.000000000
-0500
+++ XmHTML-1.1.7/lib/common/public.c 2011-09-07 07:17:34.000000000 -0400
@@ -48,6 +48,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <ctype.h>
#include <X11/IntrinsicP.h> /* Fast macros */
--- NEW FILE: xmhtml.info ---
Package: xmhtml
Version: 1.1.7
Revision: 6
Maintainer: None <fink-de...@lists.sourceforge.net>
Source: http://www.xs4all.nl/~ripley/XmHTML/dist/XmHTML-%v.tar.gz
Source-MD5: 6d079435fb954bb7878f4dd0d3f7b8d8
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
fink (>= 0.24.12-1),
fink-package-precedence,
lesstif,
libjpeg8,
libpng14
<<
PatchFile: %n.patch
PatchFile-MD5: 6f6edb5efbb91f0187b31119b2478d5c
PatchScript: sed 's|@prefix@|%p|g' <%{PatchFile} | patch -p1
CompileScript: <<
make
cc -dynamiclib -o lib/libXmHTML.1.dylib -install_name
%p/lib/libXmHTML.1.dylib -compatibility_version 1.1.7 -current_version 1.1.7
-all_load lib/libXmHTML.a -lz -L%p/lib -ljpeg -lpng -lXm -L/usr/X11R6/lib -lXt
-lX11 -lXext
fink-package-precedence --depfile-ext='\.d$' --prohibit-bdep=%n .
<<
InstallScript: <<
mkdir -p %i/include
mkdir -p %i/lib
cp -r include/XmHTML %i/include
install -c lib/libXmHTML.a lib/libXmHTML.1.dylib %i/lib
ln -s libXmHTML.1.dylib %i/lib/libXmHTML.dylib
<<
DocFiles: <<
APPS BUG-REPORTING CHANGES DEBUGGING FEEDBACK FIXES LICENSE COPYING.LIB README
THANKS TODO
<<
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: <<
lesstif-shlibs,
libjpeg8-shlibs,
libpng14-shlibs
<<
Files: lib/libXmHTML.1.dylib
Shlibs: %p/lib/libXmHTML.1.dylib 1.1.7 %n (>= 1.1.7-2)
DocFiles: LICENSE COPYING.LIB README
<<
Description: Motif widgets for displaying HTML documents
DescDetail: <<
XmHTML is a Motif widget capable of displaying HTML 3.2 documents.
Features include a very good HTML parser (which is as also available
as a Widget) with excellent document verification and repair capabilities.
Features built in support for X11 bitmaps, pixmaps, GIF87a & GIF89a
(using a patent free LZW decoding method), animated gifs, JPEG (baseline
and progressive) and PNG (all features supported), anchor highlighting,
text justification, full HTML <FRAME> support, HTML frames and many more.
<<
DescPort: <<
Disabled building of examples and tools as not required. Share libraries
built manually from the static one.
Misc cleanups for implicit function declarations.
Fix confusion of string-pointer to first char of it.
Uses lots of deprecated png struct accesses, would require
hacking to be buildable with libpng15.
<<
DescPackaging: <<
Originally packaged by Matt Stephenson.
<<
License: GPL/LGPL
Homepage: http://www.xs4all.nl/~ripley/XmHTML/
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
