Upgrade from 1.700.2 to 1.700.5 (released on Oct 4th).

5 files changed, 23 insertions, 18 deletions

diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index d8fac410f61d..59a6e64fa031 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jasper
-PORTVERSION=	1.700.2
+PORTVERSION=	1.700.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ece.uvic.ca/~mdadams/jasper/software/ \
 		${MASTER_SITE_IMAGEMAGICK}
@@ -23,7 +23,8 @@ USE_ZIP=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=  --disable-ltlibs --release-ignore
-CONFIGURE_ARGS=	--enable-shared --enable-static
+CONFIGURE_ARGS=	--enable-shared --enable-static \
+		--program-transform-name=q	# Tells sed(1) to quit
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index 014015574b0d..26acc034b26b 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1 +1 @@
-MD5 (jasper-1.700.2.zip) = 4eedf9b1c1cdc53c631673eefe917599
+MD5 (jasper-1.700.5.zip) = 6c21653efce946a611a78876fb7ebf3b
diff --git a/graphics/jasper/files/patch-configure b/graphics/jasper/files/patch-configure
index 9bcf55bc9d65..094dfc49d9ee 100644
--- a/graphics/jasper/files/patch-configure
+++ b/graphics/jasper/files/patch-configure
@@ -3,15 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Mon Feb 24 09:21:58 2003
 +++ configure	Wed May  7 19:29:07 2003
-@@ -720,7 +720,7 @@
- 
- JAS_MAJOR_VERSION=1
- JAS_MINOR_VERSION=700
--JAS_MICRO_VERSION=2
-+JAS_MICRO_VERSION=4
- JAS_INTERFACE_AGE=0
- JAS_BINARY_AGE=0
- JAS_VERSION=$JAS_MAJOR_VERSION.$JAS_MINOR_VERSION.$JAS_MICRO_VERSION
 @@ -5469,6 +5469,7 @@
  
  # This can be used to rebuild libtool when needed
diff --git a/graphics/jasper/files/patch-src-libjasper-Makefile.in b/graphics/jasper/files/patch-src-libjasper-Makefile.in
new file mode 100644
index 000000000000..d98b8518be69
--- /dev/null
+++ b/graphics/jasper/files/patch-src-libjasper-Makefile.in
@@ -0,0 +1,14 @@
+$FreeBSD$
+
+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
+@@ -234,5 +234,5 @@
+ libjasper_la_LDFLAGS = \
+ 	-release $(LT_RELEASE) \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++	-version-info 4:0:0
+ 
+ subdir = src/libjasper
diff --git a/graphics/jasper/files/patch-src-libjasper-include-jasper-jas_types.h b/graphics/jasper/files/patch-src-libjasper-include-jasper-jas_types.h
index f55c3f4c9e5d..5d1fbc0bdb84 100644
--- a/graphics/jasper/files/patch-src-libjasper-include-jasper-jas_types.h
+++ b/graphics/jasper/files/patch-src-libjasper-include-jasper-jas_types.h
@@ -1,9 +1,8 @@
-
 $FreeBSD$
 
---- src/libjasper/include/jasper/jas_types.h	2003/01/19 20:08:07	1.1
-+++ src/libjasper/include/jasper/jas_types.h	2003/01/19 20:07:51
-@@ -246,13 +246,13 @@
+--- src/libjasper/include/jasper/jas_types.h	Sat Oct  4 12:57:58 2003
++++ src/libjasper/include/jasper/jas_types.h	Wed Dec 17 10:29:46 2003
+@@ -223,13 +223,13 @@
  #endif
  /**********/
  #if !defined(INT_FAST64_MIN)
@@ -13,9 +12,9 @@ $FreeBSD$
  #define INT_FAST64_MAX	LLONG_MAX
  #endif
  /**********/
- #if !defined(UINT_FAST64_MIN)
+ #if !defined(UINT_FAST64_MAX)
 -typedef ulonglong uint_fast64_t;
 +typedef unsigned long long uint_fast64_t;
- #define UINT_FAST64_MIN	ULLONG_MIN
  #define UINT_FAST64_MAX	ULLONG_MAX
  #endif
+ /**********/