Update of grace to version 5.1.1

Fix: Apply the attached patches.
	It is essential to uptdate XmHTML, too!
	I try to contact the maintainer of XmHTML, but no answer.

PORTNAME=	grace
! PORTVERSION=	5.0.3g
  CATEGORIES=	math print
  #
  # You never know when and why this caotic team moves it to ../src/old/   :-)
--- 6,12 ----
  #

  PORTNAME=	grace
! PORTVERSION=	5.1.1
  CATEGORIES=	math print
  #
  # You never know when and why this caotic team moves it to ../src/old/   :-)
***************
MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE

- BUILD_DEPENDS=  ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp
  LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae 	\
  		Xpm.4:${PORTSDIR}/graphics/xpm		\
  		netcdf.1:${PORTSDIR}/math/netcdf	\
  		fftw.2:${PORTSDIR}/math/fftw		\
- 		pdf.2:${PORTSDIR}/print/pdflib		\
  		tiff.4:${PORTSDIR}/graphics/tiff	\
  		jpeg.9:${PORTSDIR}/graphics/jpeg	\
! 		png.4:${PORTSDIR}/graphics/png		\
! 		t1.1:${PORTSDIR}/devel/t1lib

  MAN1=		grace.1 xmgrace.1 gracebat.1 grconvert.1

--- 17,46 ----
  		ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/old/ \
  		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/old/ \
  		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/
!
! #
! # Hack to build xmgrace with pdflib-3.01 wich is very useful!
! # Alas the pdflib-3.0 conflicts with PHP-3.
! # I don't know how to fix this Problem. The ports collection has no concept
! # for different versions of the same package.
! #
! PATCH_SITES=	http://www.pdflib.com/pdflib/download/ \
!                 http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
!
! PATCHFILES=	pdflib-3.01.tar.gz
!

  MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE

  LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae 	\
  		Xpm.4:${PORTSDIR}/graphics/xpm		\
  		netcdf.1:${PORTSDIR}/math/netcdf	\
  		fftw.2:${PORTSDIR}/math/fftw		\
  		tiff.4:${PORTSDIR}/graphics/tiff	\
  		jpeg.9:${PORTSDIR}/graphics/jpeg	\
! 		png.3:${PORTSDIR}/graphics/png		\
! 		t1.1:${PORTSDIR}/devel/t1lib		\
! 		XmHTML.1:${PORTSDIR}/x11-toolkits/xmhtml

  MAN1=		grace.1 xmgrace.1 gracebat.1 grconvert.1

***************
ALL_TARGET=
  INSTALL_TARGET= install links
--- 49,58 ----
  REQUIRES_MOTIF=	YES
  HAS_CONFIGURE=	YES
  CONFIGURE_ARGS=	-prefix=${X11BASE} \
! 	--with-extra-incpath=${WRKDIR}/pdflib-3.01/inst/include:${X11BASE}/include/X11:${LOCALBASE}/include \
! 	--with-extra-ldpath=${LOCALBASE}/lib \
  	--enable-grace-home=${X11BASE}/lib/X11/grace \
! 	--with-pdf-library=${WRKDIR}/pdflib-3.01/inst/lib/libpdf.a

  ALL_TARGET=
  INSTALL_TARGET= install links
***************
post-install:
! 	${LN} -s ${X11BASE}/lib/X11/grace/doc ${X11BASE}/share/doc/grace

  .include <bsd.port.mk>
--- 62,81 ----
  	${SED} "s%-lXm %${MOTIFLIB} %" ${WRKSRC}/configure.input > ${WRKSRC}/configure
  	${RM} -f ${WRKSRC}/configure.input

+ #
+ # HACK! Needed cause pdflib-3 isn't available in the ports collection
+ #
+ pre-configure:
+ 	cd ${WRKDIR}; \
+ 	tar zxvf ${DISTDIR}/${PATCHFILES}; \
+ 	cd pdflib-3.01; \
+ 	CFLAGS=-O2 ./configure --enable-shared=no --prefix=${WRKDIR}/pdflib-3.01/inst; \
+ 	${MAKE}; ${MAKE} install; \
+ 	cp -f ${WRKDIR}/pdflib-3.01/pdflib/.libs/libpdf.a ${WRKDIR}/pdflib-3.01/inst/lib
+
  post-install:
! 	if [ ! -e ${X11BASE}/share/doc/grace ]; then \
! 	    ${LN} -s ${X11BASE}/lib/X11/grace/doc ${X11BASE}/share/doc/grace; \
! 	fi

  .include <bsd.port.mk>
--- 1,7 ----
! *** configure.orig	Mon May 22 19:54:43 2000
! --- configure	Mon May 22 19:54:47 2000
  ***************
! *** 2590,2596 ****
    # It thinks the first close brace ends the variable substitution.
    test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'

***************
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

! --- 1827,1833 ----
    # It thinks the first close brace ends the variable substitution.
    test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'

--- 9,15 ----

    test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

! --- 2590,2596 ----
    # It thinks the first close brace ends the variable substitution.
    test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'

***************
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

- ***************
- *** 8939,8942 ****
-   chmod +x $CONFIG_STATUS
-   rm -fr confdefs* $ac_clean_files
-   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
- -
- --- 8934,8936 ----
--- 17,19 ----
- ***************
- *** 119,122 ****
-
-   # HTML help viewer command
-   HELPVIEWER=@HELPVIEWER@
- -
- --- 120,122 ----
--- 10,12 ----
links : dummy

! --- 31,37 ----
    install : $(EXAMPLES) $(DOTEST)
    	$(MKINSTALLDIRS) $(GRACE_HOME)/examples
    	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
--- 9,15 ----

    links : dummy

! --- 33,39 ----
    install : $(EXAMPLES) $(DOTEST)
    	$(MKINSTALLDIRS) $(GRACE_HOME)/examples
    	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
tests : dummy

! --- 66,72 ----
    	$(MKINSTALLDIRS) $(PREFIX)/man
    	$(MKINSTALLDIRS) $(PREFIX)/man/man1
    	cd $(PREFIX)/man/man1; \
--- 9,15 ----

    tests : dummy

! --- 78,84 ----
    	$(MKINSTALLDIRS) $(PREFIX)/man
    	$(MKINSTALLDIRS) $(PREFIX)/man/man1
    	cd $(PREFIX)/man/man1; \
!  ###############################
!  # Flags used for debugging
!  #
! -DEBUG="-g"
! +#DEBUG="-g"
!  ###############################
--- 1,13 ----
! *** src/pdfdrv.c.org	Thu Apr 20 22:34:34 2000
! --- src/pdfdrv.c	Thu Aug  3 21:23:05 2000
! ***************
! *** 57,62 ****
! --- 57,64 ----
!   #  include "motifinc.h"
!   #endif

! + #define PDF_set_fillrule(handle, rule) PDF_set_parameter(handle, "fillrule", rule)
! +
!   static void pdf_error_handler(PDF *p, int type, const char* msg);
!
!   static unsigned long page_scale;
-----------------------------------------------------------------------

PORTNAME=	XmHTML
! PORTVERSION= 	1.1.0
  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

  MAINTAINER=	thepish@freebsd.org

  LIB_DEPENDS=    png.4:${PORTSDIR}/graphics/png \
! 		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}/

  pre-install:
  	${ECHO} "installing examples into ${EXMP_DIR}"
--- 6,38 ----
  #

  PORTNAME=	XmHTML
! PORTVERSION= 	1.1.7
  CATEGORIES=	x11-toolkits www
! MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist

  MAINTAINER=	thepish@freebsd.org

  LIB_DEPENDS=    png.4:${PORTSDIR}/graphics/png \
! 		jpeg.9:${PORTSDIR}/graphics/jpeg \
! 		Xpm.4:${PORTSDIR}/graphics/xpm


! REQUIRES_MOTIF=	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}"
***************
post-install:
! 	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib

  .include <bsd.port.mk>
--- 42,54 ----
  	@ ${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 ${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

!  HEADERS = XmHTML.h XmHTMLP.h HTML.h Parser.h ParserP.h

--- 1,15 ----
! --- 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

!  # The XmHTML library
! -XMHTMLLIB = -L../lib -lXmHTML
! +XMHTMLLIB = ../lib/libXmHTML.la

!  # 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)

!  SRCS = simple_html.c simple_html2.c autosize_html.c forced_html.c html.c

--- 1,23 ----
! --- 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.
!  #

! -LIBRARY=libhttp.a
! +LIBRARY=libhttp.la

!  # 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)

!  XCOMM common routines for all examples
!  XCOMM
--- 1,26 ----
! $NetBSD: patch-ad,v 1.3 1999/11/13 07:31:40 jlam Exp $

! --- 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

!  # 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 \
!  XCOMM X libraries, required for reptype
! -LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) $(DEFAULT_LIBS)
! +LOCAL_LIBRARIES = $(MOTIFLIB) $(XTOOLLIB) $(XLIB) $(DMALLOCLIB) $(DEFAULT_LIBS)

!  #if (IHaveZLIB)
!  SRCS = GetRepTypes.c WidgetSize.c gifinfo.c ImBuffer.c parse.c gif2gzf.c \
--- 1,11 ----
! --- tools/Makefile.orig	Wed Feb  3 19:43:27 1999
! +++ tools/Makefile	Tue Nov  2 01:38:36 1999
! @@ -88,7 +88,7 @@

!  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
How-To-Repeat: 
	-