Attachment #75357 for bug #108869

View | Details | Raw Unified | Return to bug 108869
Collapse All | Expand All

Lines 6-13 Link Here

(-)graphics/jasper/Makefile (-2 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= jasper	8	PORTNAME= jasper
9	PORTVERSION= 1.701.0	9	PORTVERSION= 1.900.1
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \	11	MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
13	${MASTER_SITE_IMAGEMAGICK}	12	${MASTER_SITE_IMAGEMAGICK}
Lines 31-37 Link Here
31	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \	30	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
32	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/&,}	31	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/&,}
33		32
		33	.if !defined(NO_INSTALL_MANPAGES)
		34	MAN1= imgcmp.1 imginfo.1 jasper.1 jiv.1
		35	.endif
		36
34	post-install:	37	post-install:
		38	.if !defined(NO_INSTALL_MANPAGES)
		39	@cd ${WRKSRC}/src/appl && make install-man
		40	.endif
35	.if !defined(NOPORTDOCS)	41	.if !defined(NOPORTDOCS)
36	@${MKDIR} ${DOCSDIR}	42	@${MKDIR} ${DOCSDIR}
37	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}	43	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}

Lines 1-3 Link Here

(-)graphics/jasper/distinfo (-3 / +3 lines)
1	MD5 (jasper-1.701.0.zip) = 22a9f74fc880e38dd125c60aa4e4ce97	1	MD5 (jasper-1.900.1.zip) = a342b2b4495b3e1394e161eb5d85d754
2	SHA256 (jasper-1.701.0.zip) = 3593532a6dd812d665d7c04d8bb7851e01a9e168f6e851aa63a075f74baf703e	2	SHA256 (jasper-1.900.1.zip) = 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
3	SIZE (jasper-1.701.0.zip) = 1361754	3	SIZE (jasper-1.900.1.zip) = 1415752

Line 0 Link Here

(-)graphics/jasper/files/patch-src-appl-Makefile.in (+11 lines)
	1	--- src/appl/Makefile.in.orig Wed Feb 7 11:37:26 2007
	2	+++ src/appl/Makefile.in Wed Feb 7 11:37:36 2007
	3	@@ -599,7 +599,7 @@
	4
	5	info-am:
	6
	7	-install-data-am: install-man
	8	+install-data-am:
	9
	10	install-exec-am: install-binPROGRAMS
	11




--- 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 @@
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 @@
 
 # -release $(LT_RELEASE)
 libjasper_la_LDFLAGS = \
-	-release $(LT_RELEASE) \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-version-info 4:0:0
 
 all: all-recursive
 




--- 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 @@
--- 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 @@
 			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) {
 			jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
 			  "warning: trailing garbage in marker segment (%ld bytes)\n",
 			  ms->len - jas_stream_tell(tmpstream));
 		}

Lines 1-6 Link Here

(-)graphics/jasper/pkg-plist (+2 lines)
1	bin/imgcmp	1	bin/imgcmp
2	bin/imginfo	2	bin/imginfo
3	bin/jasper	3	bin/jasper
		4	bin/tmrdemo
4	include/jasper/jas_cm.h	5	include/jasper/jas_cm.h
5	include/jasper/jas_config.h	6	include/jasper/jas_config.h
6	include/jasper/jas_config2.h	7	include/jasper/jas_config2.h
Lines 15-20 Link Here
15	include/jasper/jas_seq.h	16	include/jasper/jas_seq.h
16	include/jasper/jas_stream.h	17	include/jasper/jas_stream.h
17	include/jasper/jas_string.h	18	include/jasper/jas_string.h
		19	include/jasper/jas_tmr.h
18	include/jasper/jas_tvp.h	20	include/jasper/jas_tvp.h
19	include/jasper/jas_types.h	21	include/jasper/jas_types.h
20	include/jasper/jas_version.h	22	include/jasper/jas_version.h

Return to bug 108869

Lines 1-15 Link Here

(-)graphics/jasper/files/patch-src-libjasper-Makefile.in (-10 / +6 lines)
1	$FreeBSD: ports/graphics/jasper/files/patch-src-libjasper-Makefile.in,v 1.2 2004/06/19 10:22:56 eik Exp $	1	--- src/libjasper/Makefile.in.orig Wed Feb 7 11:18:06 2007
2		2	+++ src/libjasper/Makefile.in Wed Feb 7 11:18:28 2007
3	Somehow FreeBSD's version of -ljasper climbed up to 4 already, while the	3	@@ -290,7 +290,7 @@
4	vendor keeps installing as version 1.
5
6	--- src/libjasper/Makefile.in Sat Oct 4 14:15:47 2003
7	+++ src/libjasper/Makefile.in Wed Dec 17 11:13:16 2003
8	@@ -187,6 +187,5 @@
9		4
		5	# -release $(LT_RELEASE)
10	libjasper_la_LDFLAGS = \	6	libjasper_la_LDFLAGS = \
11	- -release $(LT_RELEASE) \
12	- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	7	- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
13	+ -version-info 4:0:0	8	+ -version-info 4:0:0
14		9
15	subdir = src/libjasper	10	all: all-recursive
		11

Lines 1-14 Link Here

(-)graphics/jasper/files/patch-src::libjasper::jpc::jpc_cs.c (-8 / +5 lines)
1		1	--- src/libjasper/jpc/jpc_cs.c.orig Fri Jan 19 21:43:07 2007
2	$FreeBSD: ports/graphics/jasper/files/patch-src::libjasper::jpc::jpc_cs.c,v 1.1 2003/05/06 16:27:48 sobomax Exp $	2	+++ src/libjasper/jpc/jpc_cs.c Wed Feb 7 11:05:57 2007
3		3	@@ -288,7 +288,7 @@
4	--- src/libjasper/jpc/jpc_cs.c 2003/05/07 16:24:56 1.1
5	+++ src/libjasper/jpc/jpc_cs.c 2003/05/07 16:25:31
6	@@ -337,7 +337,7 @@
7	jpc_ms_dump(ms, stderr);	4	jpc_ms_dump(ms, stderr);
8	}	5	}
9		6
10	- if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {	7	- if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {
11	+ if (JAS_CAST(unsigned long, jas_stream_tell(tmpstream)) != ms->len) {	8	+ if (JAS_CAST(unsigned long, jas_stream_tell(tmpstream)) != ms->len) {
12	fprintf(stderr,	9	jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
13	"warning: trailing garbage in marker segment (%ld bytes)\n",
14	ms->len - jas_stream_tell(tmpstream));	10	ms->len - jas_stream_tell(tmpstream));
		11	}