ports/108869: [UPDATE] graphics/jasper 1.700.0 -> 1.900.1

[Martin Matuska]

>Number:         108869
>Category:       ports
>Synopsis:       [UPDATE] graphics/jasper 1.700.0 -> 1.900.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 07 12:40:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of graphics/jasper from 1.700.0 to 1.900.1

Tested with portlint & tinderbox.

Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/jasper-1.900.1.log

>How-To-Repeat:
>Fix:
diff -Nbur graphics/jasper.orig/Makefile graphics/jasper/Makefile
--- graphics/jasper.orig/Makefile	Sat Feb  3 21:58:59 2007
+++ graphics/jasper/Makefile	Wed Feb  7 12:43:34 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jasper
-PORTVERSION=	1.701.0
-PORTREVISION=	1
+PORTVERSION=	1.900.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ece.uvic.ca/~mdadams/jasper/software/ \
 		${MASTER_SITE_IMAGEMAGICK}
@@ -31,7 +30,14 @@
 	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/&,}
 
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=		imgcmp.1 imginfo.1 jasper.1 jiv.1
+.endif
+
 post-install:
+.if !defined(NO_INSTALL_MANPAGES)
+	@cd ${WRKSRC}/src/appl && make install-man
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
diff -Nbur graphics/jasper.orig/distinfo graphics/jasper/distinfo
--- graphics/jasper.orig/distinfo	Sat Nov 26 02:47:43 2005
+++ graphics/jasper/distinfo	Wed Feb  7 12:02:21 2007
@@ -1,3 +1,3 @@
-MD5 (jasper-1.701.0.zip) = 22a9f74fc880e38dd125c60aa4e4ce97
-SHA256 (jasper-1.701.0.zip) = 3593532a6dd812d665d7c04d8bb7851e01a9e168f6e851aa63a075f74baf703e
-SIZE (jasper-1.701.0.zip) = 1361754
+MD5 (jasper-1.900.1.zip) = a342b2b4495b3e1394e161eb5d85d754
+SHA256 (jasper-1.900.1.zip) = 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
+SIZE (jasper-1.900.1.zip) = 1415752
diff -Nbur graphics/jasper.orig/files/patch-src-appl-Makefile.in graphics/jasper/files/patch-src-appl-Makefile.in
--- graphics/jasper.orig/files/patch-src-appl-Makefile.in	Thu Jan  1 01:00:00 1970
+++ graphics/jasper/files/patch-src-appl-Makefile.in	Wed Feb  7 12:37:56 2007
@@ -0,0 +1,11 @@
+--- src/appl/Makefile.in.orig	Wed Feb  7 11:37:26 2007
++++ src/appl/Makefile.in	Wed Feb  7 11:37:36 2007
+@@ -599,7 +599,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-man
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS
+ 
diff -Nbur graphics/jasper.orig/files/patch-src-libjasper-Makefile.in graphics/jasper/files/patch-src-libjasper-Makefile.in
--- graphics/jasper.orig/files/patch-src-libjasper-Makefile.in	Sat Jun 19 12:22:56 2004
+++ graphics/jasper/files/patch-src-libjasper-Makefile.in	Wed Feb  7 12:19:13 2007
@@ -1,15 +1,11 @@
-$FreeBSD: ports/graphics/jasper/files/patch-src-libjasper-Makefile.in,v 1.2 2004/06/19 10:22:56 eik Exp $
-
-Somehow FreeBSD's version of -ljasper climbed up to 4 already, while the
-vendor keeps installing as version 1.
-
---- src/libjasper/Makefile.in	Sat Oct  4 14:15:47 2003
-+++ src/libjasper/Makefile.in	Wed Dec 17 11:13:16 2003
-@@ -187,6 +187,5 @@
+--- src/libjasper/Makefile.in.orig	Wed Feb  7 11:18:06 2007
++++ src/libjasper/Makefile.in	Wed Feb  7 11:18:28 2007
+@@ -290,7 +290,7 @@
  
+ # -release $(LT_RELEASE)
  libjasper_la_LDFLAGS = \
--	-release $(LT_RELEASE) \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +	-version-info 4:0:0
  
- subdir = src/libjasper
+ all: all-recursive
+ 
diff -Nbur graphics/jasper.orig/files/patch-src::libjasper::jpc::jpc_cs.c graphics/jasper/files/patch-src::libjasper::jpc::jpc_cs.c
--- graphics/jasper.orig/files/patch-src::libjasper::jpc::jpc_cs.c	Tue May  6 18:27:48 2003
+++ graphics/jasper/files/patch-src::libjasper::jpc::jpc_cs.c	Wed Feb  7 12:06:38 2007
@@ -1,14 +1,11 @@
-
-$FreeBSD: ports/graphics/jasper/files/patch-src::libjasper::jpc::jpc_cs.c,v 1.1 2003/05/06 16:27:48 sobomax Exp $
-
---- src/libjasper/jpc/jpc_cs.c	2003/05/07 16:24:56	1.1
-+++ src/libjasper/jpc/jpc_cs.c	2003/05/07 16:25:31
-@@ -337,7 +337,7 @@
+--- src/libjasper/jpc/jpc_cs.c.orig	Fri Jan 19 21:43:07 2007
++++ src/libjasper/jpc/jpc_cs.c	Wed Feb  7 11:05:57 2007
+@@ -288,7 +288,7 @@
  			jpc_ms_dump(ms, stderr);
  		}
  
 -		if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {
 +		if (JAS_CAST(unsigned long, jas_stream_tell(tmpstream)) != ms->len) {
- 			fprintf(stderr,
- 			  "warning: trailing garbage in marker segment (%ld bytes)\n",
+ 			jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
  			  ms->len - jas_stream_tell(tmpstream));
+ 		}
diff -Nbur graphics/jasper.orig/pkg-plist graphics/jasper/pkg-plist
--- graphics/jasper.orig/pkg-plist	Thu Feb 23 11:37:05 2006
+++ graphics/jasper/pkg-plist	Wed Feb  7 12:33:02 2007
@@ -1,6 +1,7 @@
 bin/imgcmp
 bin/imginfo
 bin/jasper
+bin/tmrdemo
 include/jasper/jas_cm.h
 include/jasper/jas_config.h
 include/jasper/jas_config2.h
@@ -15,6 +16,7 @@
 include/jasper/jas_seq.h
 include/jasper/jas_stream.h
 include/jasper/jas_string.h
+include/jasper/jas_tmr.h
 include/jasper/jas_tvp.h
 include/jasper/jas_types.h
 include/jasper/jas_version.h
>Release-Note:
>Audit-Trail:
>Unformatted: