Attachment 85209 Details for Bug 121328 – file.diff

[patch] file.diff

file.diff (text/plain), 3.95 KB, created by bf on 2008-03-03 19:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2008-03-03 19:10:02 UTC

Size: 3.95 KB

patch

obsolete

>diff -ruN png.orig/Makefile png/Makefile
>--- png.orig/Makefile	2008-03-03 13:31:39.772549769 -0500
>+++ png/Makefile	2008-03-03 13:31:54.277387395 -0500
>@@ -6,25 +6,19 @@
> #
> 
> PORTNAME=	png
>-PORTVERSION=	1.2.23
>-PORTREVISION=	1
>+PORTVERSION=	1.2.25
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	lib${PORTNAME}
> DISTNAME=	lib${PORTNAME}-${PORTVERSION}
> 
>-PATCH_SITES=	${MASTER_SITES}
>-#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
>-#PATCHFILES=
>-#PATCH_DIST_STRIP= -p1
>-
> MAINTAINER=	ache@FreeBSD.org
> COMMENT=	Library for manipulating PNG images
> 
> MAKEFILE=	${WRKSRC}/scripts/makefile.freebsd
> ALL_TARGET=	all libpng-config test
> MAKE_FLAGS=	ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f
>-INSTALLS_SHLIB=	yes
>+USE_LDCONFIG=	yes
> SHLIB_VER=	5
> USE_BZIP2=	yes
> 
>diff -ruN png.orig/distinfo png/distinfo
>--- png.orig/distinfo	2008-03-03 13:31:39.772549769 -0500
>+++ png/distinfo	2008-03-03 13:31:54.277387395 -0500
>@@ -1,3 +1,3 @@
>-MD5 (libpng-1.2.23.tar.bz2) = b1b3794a8b80dd298d4d216f4886ad52
>-SHA256 (libpng-1.2.23.tar.bz2) = 87da54b8b03156d0ff6d4904e01f2afaf12c712f628f43c5f499704379c2b478
>-SIZE (libpng-1.2.23.tar.bz2) = 614843
>+MD5 (libpng-1.2.25.tar.bz2) = 0c1df914de7fd3b6a129af569889c856
>+SHA256 (libpng-1.2.25.tar.bz2) = 2e92eada0c32d5e49da5617d389e43bc27a18bdca4b8d7badb7fee931d157ce0
>+SIZE (libpng-1.2.25.tar.bz2) = 638262
>diff -ruN png.orig/files/patch-ab png/files/patch-ab
>--- png.orig/files/patch-ab	2008-03-03 13:31:39.768547585 -0500
>+++ png/files/patch-ab	1969-12-31 19:00:00.000000000 -0500
>@@ -1,18 +0,0 @@
>---- scripts/libpng.pc.in.orig	Wed Jun 28 00:22:40 2006
>-+++ scripts/libpng.pc.in	Sun Jul 23 10:56:25 2006
>-@@ -1,10 +1,10 @@
>--prefix=@prefix@
>--exec_prefix=@exec_prefix@
>--libdir=@libdir@
>--includedir=@includedir@/libpng12
>-+prefix=@PREFIX@
>-+exec_prefix=${prefix}
>-+libdir=${exec_prefix}/lib
>-+includedir=${prefix}/include
>- 
>- Name: libpng
>- Description: Loads and saves PNG files
>- Version: 1.2.23
>--Libs: -L${libdir} -lpng12
>-+Libs: -L${libdir} -lpng -lz -lm
>- Cflags: -I${includedir}
>diff -ruN png.orig/files/patch-ad png/files/patch-ad
>--- png.orig/files/patch-ad	2008-03-03 13:31:39.768547585 -0500
>+++ png/files/patch-ad	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- pngconf.h.orig	2007-10-04 15:53:09.000000000 +0400
>-+++ pngconf.h	2007-10-13 17:31:06.000000000 +0400
>-@@ -737,7 +737,7 @@
>- #  endif
>- #endif
>- 
>--#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
>-+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
>- #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
>- #    define PNG_ASSEMBLER_CODE_SUPPORTED
>- #  endif
>diff -ruN png.orig/files/patch-pngconf.h png/files/patch-pngconf.h
>--- png.orig/files/patch-pngconf.h	1969-12-31 19:00:00.000000000 -0500
>+++ png/files/patch-pngconf.h	2008-03-03 13:31:54.277387395 -0500
>@@ -0,0 +1,11 @@
>+--- pngconf.h.orig	2008-03-03 12:26:00.438934464 -0500
>++++ pngconf.h	2008-03-03 12:27:33.024234271 -0500
>+@@ -742,7 +742,7 @@
>+ #  endif
>+ #endif
>+ 
>+-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
>++#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
>+ #  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
>+ #    define PNG_ASSEMBLER_CODE_SUPPORTED
>+ #  endif
>diff -ruN png.orig/files/patch-scripts+libpng.pc.in png/files/patch-scripts+libpng.pc.in
>--- png.orig/files/patch-scripts+libpng.pc.in	1969-12-31 19:00:00.000000000 -0500
>+++ png/files/patch-scripts+libpng.pc.in	2008-03-03 13:47:10.293847029 -0500
>@@ -0,0 +1,18 @@
>+--- scripts/libpng.pc.in.orig	2008-03-03 13:40:05.365510327 -0500
>++++ scripts/libpng.pc.in	2008-03-03 13:45:11.163017831 -0500
>+@@ -1,10 +1,10 @@
>+-prefix=@prefix@
>+-exec_prefix=@exec_prefix@
>+-libdir=@libdir@
>+-includedir=@includedir@/libpng12
>++prefix=@PREFIX@
>++exec_prefix=${prefix}
>++libdir=${prefix}/lib
>++includedir=${prefix}/include
>+ 
>+ Name: libpng
>+ Description: Loads and saves PNG files
>+ Version: 1.2.25
>+-Libs: -L${libdir} -lpng12
>++Libs: -L${libdir} -lpng -lz -lm
>+ Cflags: -I${includedir}

Actions: View | Diff

Attachments on bug 121328: 85209