Upgrade to 2.0.8, and associated changes.

5 files changed, 105 insertions, 17 deletions

diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index c98a6471d838..e0f6b65ec177 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -1,29 +1,23 @@
 # New ports collection makefile for:	stamp
-# Version required:	0.610
+# Version required:	2.0.8
 # Date created:	11 August 1998
 # Whom:		Bill Fumerola <billf@chc-chimes.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	stamp
-PKGNAME=	stamp-0.61
+DISTNAME=	stamp-2.0.8
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.telepath.com/booger/
+MASTER_SITES=	http://stamp.netpedia.net/
 
 MAINTAINER=	billf@FreeBSD.org
 
-BROKEN=		"distfile is gone, new distfile requires getopt solution"
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-ALL_TARGET=
-
-post-patch:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old
-	${SED} -e 's#/usr/local#${PREFIX}#' ${WRKSRC}/Makefile.old >> ${WRKSRC}/Makefile
-
-post-install:
-	strip ${PREFIX}/bin/stamp
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
+USE_GMAKE=	unfortunatly
 
 .include <bsd.port.mk>
diff --git a/graphics/stamp/distinfo b/graphics/stamp/distinfo
index e9523ec8d93b..fa346b1101e6 100644
--- a/graphics/stamp/distinfo
+++ b/graphics/stamp/distinfo
@@ -1 +1 @@
-MD5 (stamp.tar.gz) = 2e899d64d4dc9fb68ea360afde896643
+MD5 (stamp-2.0.8.tar.gz) = 2ed33f968599a73c3657dce4a01d6050
diff --git a/graphics/stamp/files/patch-ab b/graphics/stamp/files/patch-ab
new file mode 100644
index 000000000000..aec536730309
--- /dev/null
+++ b/graphics/stamp/files/patch-ab
@@ -0,0 +1,13 @@
+--- lib/rcfile.c.orig	Fri Dec 24 15:02:25 1999
++++ lib/rcfile.c	Fri Dec 24 15:06:09 1999
+@@ -101,8 +101,8 @@
+     exit(ERR_NOLFONT) ;
+   }
+ 
+-  if ((!(strcmp(Args->Infile,""))) ||
+-      (!(strcmp(Args->Outfile,"")))) {
++  if ((Args->Infile == NULL) ||
++      (Args->Outfile == NULL)) {
+     fprintf(stderr, "stamp: You must specify both an input and output JPEG image.\n") ;
+     exit(ERR_MISSIOFILE) ;
+   }
diff --git a/graphics/stamp/pkg-descr b/graphics/stamp/pkg-descr
index 33ea53661a7c..b6d7bbb1abdf 100644
--- a/graphics/stamp/pkg-descr
+++ b/graphics/stamp/pkg-descr
@@ -5,6 +5,6 @@ image via FTP, with the configuration of a stamprc file. It also features a
 "quad" option which will take the latest image and composite it with up to 
 three previous images, while timestamping the latest one. 
 
-WWW: http://www.telepath.com/booger/
+WWW: http://stamp.netpedia.net/
 
 Bill Fumerola <billf@chc-chimes.com>
diff --git a/graphics/stamp/pkg-plist b/graphics/stamp/pkg-plist
index 2ed230e78f91..461d259fcd54 100644
--- a/graphics/stamp/pkg-plist
+++ b/graphics/stamp/pkg-plist
@@ -1 +1,82 @@
 bin/stamp
+share/stamp/fonts/8x10.fnt
+share/stamp/fonts/8x11snsf.fnt
+share/stamp/fonts/8x14.fnt
+share/stamp/fonts/8x8.fnt
+share/stamp/fonts/antique.fnt
+share/stamp/fonts/archon.fnt
+share/stamp/fonts/b.fnt
+share/stamp/fonts/backward.fnt
+share/stamp/fonts/bigserif.fnt
+share/stamp/fonts/blcksnsf.fnt
+share/stamp/fonts/block.fnt
+share/stamp/fonts/bold.fnt
+share/stamp/fonts/breeze.fnt
+share/stamp/fonts/broadway.fnt
+share/stamp/fonts/c.fnt
+share/stamp/fonts/computer.fnt
+share/stamp/fonts/courier.fnt
+share/stamp/fonts/crakrjak.fnt
+share/stamp/fonts/cyrillic.fnt
+share/stamp/fonts/deco.fnt
+share/stamp/fonts/elite.fnt
+share/stamp/fonts/empty.fnt
+share/stamp/fonts/eurotype.fnt
+share/stamp/fonts/fat.fnt
+share/stamp/fonts/finnish.fnt
+share/stamp/fonts/flat.fnt
+share/stamp/fonts/france.fnt
+share/stamp/fonts/fresno.fnt
+share/stamp/fonts/futura-1.fnt
+share/stamp/fonts/futura-2.fnt
+share/stamp/fonts/greek.fnt
+share/stamp/fonts/hearst.fnt
+share/stamp/fonts/hebrew.fnt
+share/stamp/fonts/hylas.fnt
+share/stamp/fonts/inverted.fnt
+share/stamp/fonts/italics.fnt
+share/stamp/fonts/kids-1.fnt
+share/stamp/fonts/kids-2.fnt
+share/stamp/fonts/lcd.fnt
+share/stamp/fonts/ledfont.fnt
+share/stamp/fonts/m.fnt
+share/stamp/fonts/medieval.fnt
+share/stamp/fonts/ml.fnt
+share/stamp/fonts/mod_d.fnt
+share/stamp/fonts/mod_s.fnt
+share/stamp/fonts/modern-1.fnt
+share/stamp/fonts/modern-2.fnt
+share/stamp/fonts/mr.fnt
+share/stamp/fonts/mu.fnt
+share/stamp/fonts/norway.fnt
+share/stamp/fonts/r.fnt
+share/stamp/fonts/rev8x8.fnt
+share/stamp/fonts/reverse.fnt
+share/stamp/fonts/rl.fnt
+share/stamp/fonts/ro.fnt
+share/stamp/fonts/roman-1.fnt
+share/stamp/fonts/roman-2.fnt
+share/stamp/fonts/s.fnt
+share/stamp/fonts/sanserif.fnt
+share/stamp/fonts/sansurf.fnt
+share/stamp/fonts/sc.fnt
+share/stamp/fonts/scott.fnt
+share/stamp/fonts/scrawl_s.fnt
+share/stamp/fonts/scrawl_w.fnt
+share/stamp/fonts/script.fnt
+share/stamp/fonts/sd.fnt
+share/stamp/fonts/silver.fnt
+share/stamp/fonts/sloppy.fnt
+share/stamp/fonts/standard.fnt
+share/stamp/fonts/stretch.fnt
+share/stamp/fonts/super.fnt
+share/stamp/fonts/surreal.fnt
+share/stamp/fonts/swiss-1.fnt
+share/stamp/fonts/swiss-2.fnt
+share/stamp/fonts/swiss-3.fnt
+share/stamp/fonts/t.fnt
+share/stamp/fonts/tekton.fnt
+share/stamp/fonts/thai.fnt
+share/stamp/fonts/thin.fnt
+@dirrm share/stamp/fonts
+@dirrm share/stamp