- upgrade to gif2png 2.2.4

- add wrapper for web2png to check for Python and if it does not exist
  point the user in the right direction.

graphics/gif2png/Makefile

@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 1999/10/29 03:11:18 brad Exp $
+# $OpenBSD: Makefile,v 1.4 1999/12/06 01:11:49 brad Exp $
 
-DISTNAME=	gif2png-1.2.1
+DISTNAME=	gif2png-2.2.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.tuxedo.org/~esr/gif2png/ \
 		ftp://ftp.ccil.org/pub/esr/
@@ -10,7 +10,19 @@ MAINTAINER=	brad@openbsd.org
 LIB_DEPENDS=	png.1.3:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-png-inc="${LOCALBASE}/include" \
+		--with-png-lib="${LOCALBASE}/lib"
+
+DOCS=	COPYING README
+
+pre-patch: extract
+	@sed -e "s|@PREFIX@|${LOCALBASE}|" ${FILESDIR}/web2png > ${WRKDIR}/web2png
+
+post-install:
+	@mkdir -p ${PREFIX}/share/doc/gif2png
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/gif2png
+.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/web2png ${PREFIX}/bin
 
 .include <bsd.port.mk>

graphics/gif2png/files/md5

@@ -1,3 +1,3 @@
-MD5 (gif2png-1.2.1.tar.gz) = 8b4b81d2aace1e43899c585e0d679541
-RMD160 (gif2png-1.2.1.tar.gz) = 34305d2723678c33245812867b5d25eb1503f1bb
-SHA1 (gif2png-1.2.1.tar.gz) = 99166d0f334f4401d0dcd36de2c031345d8998a8
+MD5 (gif2png-2.2.4.tar.gz) = 4db00f7b2a7976115b947b8841d5d7e4
+RMD160 (gif2png-2.2.4.tar.gz) = 3f8251c3c89e01f736067f67a1674fd78666cb05
+SHA1 (gif2png-2.2.4.tar.gz) = b6cd11303946a4c45d4acd6a4a88df58b82ca513

graphics/gif2png/files/web2png

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Wrapper for the real web2png. Checks whether Python is installed,
+# and runs the real web2png or alerts the user, as appropriate.
+#
+
+PREFIX=@PREFIX@
+
+if [ -e $PREFIX/bin/python ]; then
+	exec $PREFIX/libexec/web2png.bin
+else
+	cat <<EOF
+The web2png program requires Python, which does not appear to be
+installed on this system. Python can be found in the OpenBSD Ports
+Collection under lang/python.
+EOF
+	exit 1
+fi

graphics/gif2png/patches/patch-aa

@@ -0,0 +1,35 @@
+--- Makefile.in.orig	Sun Dec  5 15:18:15 1999
++++ Makefile.in	Sun Dec  5 16:58:15 1999
+@@ -168,7 +168,7 @@
+ 
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/libexec
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+@@ -210,18 +210,18 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/libexec/`echo $$p.bin|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(prefix)/libexec/`echo $$p.bin|sed '$(transform)'`; \
+ 	  else if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/libexec/`echo $$p.bin|sed '$(transform)'`"; \
++	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/libexec/`echo $$p.bin|sed '$(transform)'`; \
+ 	  else :; fi; fi; \
+ 	done
+ 
+ uninstall-binSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
+ 	list='$(bin_SCRIPTS)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	  rm -f $(DESTDIR)$(prefix)/libexec/`echo $$p.bin|sed '$(transform)'`; \
+ 	done
+ 
+ install-man1:

graphics/gif2png/pkg/PLIST

@@ -1,2 +1,8 @@
 bin/gif2png
+bin/web2png
+libexec/web2png.bin
 man/man1/gif2png.1
+man/man1/web2png.1
+share/doc/gif2png/COPYING
+share/doc/gif2png/README
+@dirrm share/doc/gif2png