Update to 2.06 release.

Submitted by:	Gianmarco Giovannelli
Approved by:	maintainer timeout

4 files changed, 24 insertions, 23 deletions

diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile
index db64e0525658..681bec7a9c08 100644
--- a/graphics/jpgtn/Makefile
+++ b/graphics/jpgtn/Makefile
@@ -6,21 +6,27 @@
 #
 
 PORTNAME=	jpgtn
-PORTVERSION=	1.04
-PORTREVISION=	1
+PORTVERSION=	2.06
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/misc
+MASTER_SITE_SUBDIR=	apps/graphics/misc
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Creates thumbnails of JPEG images
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libjpeg=${LOCALBASE}
+
 MAN1=		jpgtn.1
 PLIST_FILES=	bin/jpgtn
 USE_REINPLACE=	yes
 
+WITH_MAXSIZE?=	2048
+WITH_MINSIZE?=	1
+WITH_DEFSIZE?=	128
+
 pre-everything::
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can control program functionality by defining the following variables:"
@@ -31,18 +37,25 @@ pre-everything::
 .if !defined(WITH_MINSIZE)
 	@${ECHO_MSG} "===> Define WITH_MINSIZE to set the minimum allowable thumbnail size"
 .endif
+.if !defined(WITH_DEFSIZE)
+	@${ECHO_MSG} "===> Define WITH_DEFSIZE to set the default thumbnail size"
+.endif
 	@${ECHO_MSG} "===>"
 
 post-patch:
 .if defined(WITH_MAXSIZE)
 	@${ECHO_MSG} "Setting MAXSIZE to ${WITH_MAXSIZE}"
-	@${REINPLACE_CMD} "s/define MAXSIZE[[:blank:]]*256/define MAXSIZE ${WITH_MAXSIZE}/" ${WRKSRC}/jpgtn.h
-	@${REINPLACE_CMD} "s/allowable range (24-256)/allowable range (24-${WITH_MAXSIZE})/" ${WRKSRC}/jpgtn.1
+	@${REINPLACE_CMD} "s/define MAXSIZE[[:blank:]]*2048/define MAXSIZE ${WITH_MAXSIZE}/" ${WRKSRC}/src/jpgtn.h
 .endif
 .if defined(WITH_MINSIZE)
 	@${ECHO_MSG} "Setting MINSIZE to ${WITH_MINSIZE}"
-	@${REINPLACE_CMD} "s/define MINSIZE[[:blank:]]*24/define MINSIZE ${WITH_MINSIZE}/" ${WRKSRC}/jpgtn.h
-	@${REINPLACE_CMD} "s/allowable range (24-)/allowable range (${WITH_MINSIZE}-/" ${WRKSRC}/jpgtn.1
+	@${REINPLACE_CMD} "s/define MINSIZE[[:blank:]]*1/define MINSIZE ${WITH_MINSIZE}/" ${WRKSRC}/src/jpgtn.h
+.endif
+.if defined(WITH_DEFSIZE)
+	@${ECHO_MSG} "Setting DEFAULTSIZE to ${WITH_DEFSIZE}"
+	@${REINPLACE_CMD} "s/define DEFAULTSIZE[[:blank:]]*128/define DEFAULTSIZE ${WITH_DEFSIZE}/" ${WRKSRC}/src/jpgtn.h
 .endif
+	@${REINPLACE_CMD} "s/(2-2048) the size defaults to 128/(${WITH_MINSIZE}-${WITH_MAXSIZE}) the size defaults to ${WITH_DEFSIZE}/" \
+		${WRKSRC}/doc/jpgtn.1
 
 .include <bsd.port.mk>
diff --git a/graphics/jpgtn/distinfo b/graphics/jpgtn/distinfo
index 034367d0fa4d..6b196b7f6e1e 100644
--- a/graphics/jpgtn/distinfo
+++ b/graphics/jpgtn/distinfo
@@ -1,2 +1,2 @@
-MD5 (jpgtn-1.04.tar.gz) = 50e4bfe42bcba068761ed4b4e77496e2
-SIZE (jpgtn-1.04.tar.gz) = 11679
+MD5 (jpgtn-2.06.tar.gz) = a4c0cb7874de9373158f0e2efb728ebb
+SIZE (jpgtn-2.06.tar.gz) = 118413
diff --git a/graphics/jpgtn/files/patch-aa b/graphics/jpgtn/files/patch-aa
deleted file mode 100644
index 283ac2a1c1ad..000000000000
--- a/graphics/jpgtn/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Jun 14 20:51:01 1999
-+++ Makefile	Fri Sep  7 16:51:04 2001
-@@ -17,7 +17,7 @@
- # Compiler
- #
- CC = gcc
--CFLAGS = -Wall -O2 -L/usr/local/lib/ $(SONYHACK)
-+CFLAGS = -Wall -O2 -L$(LOCALBASE)/lib -I$(LOCALBASE)/include $(SONYHACK)
- 
- #
- # Libraries
diff --git a/graphics/jpgtn/pkg-descr b/graphics/jpgtn/pkg-descr
index 61e205cbf05f..c6c2ba729230 100644
--- a/graphics/jpgtn/pkg-descr
+++ b/graphics/jpgtn/pkg-descr
@@ -6,6 +6,5 @@ differs from both "tnpic" and "gtnpic" in purpose. It is *not* an indexer
 of image files. It simply creates thumbnails of images stored in JPEG
 format.
 
-FTP: ftp://ftp.uu.net/graphics/jpeg/
-WWW: http://cs.millersv.edu/~jdmadea/
-Mail: jdmadea@cs.millersv.edu
+WWW: 	http://jpgtn.sourceforge.net/
+Mail: 	Jeremy Madea  <jeremymadea@mindspring.com>