Bug 21836

	XmHTML update to 1.1.7 from 1.1.0, necessart for grace-5.1.2!!!

Fix: Apply the appended patchfile (diff -Nru xmhtml.org xmhtml)

--
E-Mail:                                     \  Lars Koeller
  Lars.Koeller@Uni-Bielefeld.DE              \  UNIX Sysadmin
  lkoeller@cc.fh-lippe.de                     \  Computing Center
PGP-key:                                       \  University of Bielefeld
  http://www.pgp.net/pgpnet/www-key.html        \  Germany
----------- FreeBSD, what else? ---- http://www.freebsd.org -------------


PORTNAME=	XmHTML
-PORTVERSION= 	1.1.0
+PORTVERSION= 	1.1.7
 CATEGORIES=	x11-toolkits www
-MASTER_SITES=	ftp://crl.nmsu.edu/pub/XmHTML/ \
-		ftp://ftp.ist.co.uk/pub/motif/XmHTML/ \
-		ftp://ftp.nerdnet.nl/pub/X11/Widgets/XmHTML/
-
-PATCH_SITES=	ftp://crl.nmsu.edu/pub/XmHTML/
-PATCHFILES=	patch-102697.gz
+MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist

 MAINTAINER=	thepish@freebsd.org

@@ -21,11 +16,22 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg

 REQUIRES_MOTIF=	yes
-USE_IMAKE=	yes
-XMKMF=		PORTOBJFORMAT=${PORTOBJFORMAT} xmkmf -a
-
-EXMP_DIR=	${PREFIX}/share/examples/${DISTNAME}/
-DOCS_DIR=	${PREFIX}/share/doc/${DISTNAME}/
+USE_XPM=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+USE_X_PREFIX=	yes
+
+EXMP_DIR=	${X11BASE}/share/examples/${DISTNAME}/
+DOCS_DIR=	${X11BASE}/share/doc/${DISTNAME}/
+
+post-patch:
+	${TOUCH} ${WRKSRC}/configure
+	${CHMOD} 755 ${WRKSRC}/configure
+
+post-build:
+	rm -rf ${WRKSRC}/examples/.libs ${WRKSRC}/examples/*.lo ${WRKSRC}/examples/*.o
+	rm -rf ${WRKSRC}/book/.libs ${WRKSRC}/book/*.lo ${WRKSRC}/book/*.o
+	rm -rf ${WRKSRC}/contrib/.libs ${WRKSRC}/contrib/*.lo ${WRKSRC}/contrib/*.o

 pre-install:
 	${ECHO} "installing examples into ${EXMP_DIR}"
@@ -35,7 +41,13 @@
 	@ ${MKDIR} ${DOCS_DIR}
 	@ (cd ${WRKSRC}/html; tar -cpf- * | tar -xvpf- -C ${DOCS_DIR} )

+do-install:
+	${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \
+		${WRKSRC}/lib/libXmHTML.la ${X11BASE}/lib
+	${MKDIR} ${X11BASE}/include/XmHTML
+	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${X11BASE}/include/XmHTML
+
 post-install:
-	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${X11BASE}/lib

 .include <bsd.port.mk>
- XCOMM I don't know whether or not X11R5/R4 image has got a Concat3.
- XCOMM This works.
-+.if (${PORTOBJFORMAT} == "aout")
- #if (ProjectX < 6)
- SOXMHTMLLIBREV = $(XmHTMLVersionNum)./**/$(XmHTMLRevision)./**/$(XmHTMLUpdateLevel)
- #else
- SOXMHTMLLIBREV = Concat3($(XmHTMLVersionNum).,$(XmHTMLRevision).,$(XmHTMLUpdateLevel))
- #endif
-+.else
-+SOXMHTMLLIBREV = $(XmHTMLVersionNum)./**/$(XmHTMLUpdateLevel)
-+.endif
+ # The XmHTML library
+-XMHTMLLIB = -L../lib -lXmHTML
++XMHTMLLIB = ../lib/libXmHTML.la

- HEADERS = XmHTML.h XmHTMLP.h HTML.h Parser.h ParserP.h
+ # 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)
- XCOMM required libraries
--LOCAL_LIBRARIES = $(XMHTMLLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB)
-+LOCAL_LIBRARIES = $(XMHTMLLIB) $(MOTIFLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB)
+-LIBRARY=libhttp.a
++LIBRARY=libhttp.la

- SRCS = simple_html.c simple_html2.c autosize_html.c forced_html.c html.c
+ # List of source, object and header files
+ SRCS=HTTP.c cookie.c
+@@ -27,9 +27,8 @@
+ # targets to build

+ $(TARGET):: $(OBJS)
+-	$(RM) $@ \
+-	$(AR) $@ $(OBJS)
+-	$(RANLIB) $@
++	$(RM) $@
++	$(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
+
+ stamp-includes:
+ 	@if [ -d ../include ]; then set +x; \
- XCOMM required libraries
--LOCAL_LIBRARIES = $(XMHTMLLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB)
-+LOCAL_LIBRARIES = $(XMHTMLLIB) $(MOTIFLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB)
+ # Target to make
+ TARGET=$(LIBRARY)
+@@ -44,9 +44,9 @@
+ 	@(set -x; cd common; $(MAKE) all $(pass_flags) )

- XCOMM common routines for all examples
- XCOMM
+ $(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 \
- XCOMM X libraries, required for reptype
--LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) $(DEFAULT_LIBS)
-+LOCAL_LIBRARIES = $(MOTIFLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) $(DEFAULT_LIBS)
+ httpget::  httpget.o
+ 	$(RM) $@ \
+-	$(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
++	$(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)

- #if (IHaveZLIB)
- SRCS = GetRepTypes.c WidgetSize.c gifinfo.c ImBuffer.c parse.c gif2gzf.c \
+ # gif to gzf converter
+ gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o
How-To-Repeat: 
	-