Attachment 16579 Details for Bug 30356 – file.diff

[patch] file.diff

file.diff (text/plain), 2.42 KB, created by tkato on 2001-09-05 22:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2001-09-05 22:30:03 UTC

Size: 2.42 KB

patch

obsolete

>diff -urN /usr/ports/graphics/png/Makefile graphics/png/Makefile
>--- /usr/ports/graphics/png/Makefile	Thu Aug  9 03:23:36 2001
>+++ graphics/png/Makefile	Thu Sep  6 00:55:54 2001
>@@ -6,23 +6,22 @@
> #
> 
> PORTNAME=	png
>-PORTVERSION=	1.0.12
>+PORTVERSION=	1.2.0
> CATEGORIES=	graphics
>-MASTER_SITES=   http://www.libpng.org/pub/png/src/ \
>+MASTER_SITES=	http://www.libpng.org/pub/png/src/ \
> 		ftp://swrinde.nde.swri.edu/pub/png/src/ \
> 		${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	lib${PORTNAME}
>-DISTFILES=	lib${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
>+DISTNAME=	lib${PORTNAME}-${PORTVERSION}
> 
> #PATCH_SITES=	ftp://ftp.libpng.org/pub/png/src/
> #PATCHFILES=
> 
> MAINTAINER=	ache@FreeBSD.org
> 
>-WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
>-
>+MAKEFILE=	${WRKSRC}/scripts/makefile.std
> INSTALLS_SHLIB=	yes
>-SHLIB_VER=	4
>+SHLIB_VER=	5
> 
> MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
> PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
>@@ -49,8 +48,5 @@
> 	@${ECHO_MSG} " (486 and downward, old Pentiums and clones, PentiumPro etc.)."
> 	@${ECHO_MSG}
> .endif
>-
>-do-configure:
>-	${LN} -sf ${WRKSRC}/scripts/makefile.std ${WRKSRC}/Makefile
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/graphics/png/distinfo graphics/png/distinfo
>--- /usr/ports/graphics/png/distinfo	Mon Jun 11 15:29:19 2001
>+++ graphics/png/distinfo	Thu Sep  6 00:13:07 2001
>@@ -1 +1 @@
>-MD5 (libpng-1.0.12.tar.gz) = 3329b745968e41f6f9e55a4d04a4964c
>+MD5 (libpng-1.2.0.tar.gz) = 0768b511b9cabb052c72146dd0de79d8
>diff -urN /usr/ports/graphics/png/files/patch-aa graphics/png/files/patch-aa
>--- /usr/ports/graphics/png/files/patch-aa	Wed Jul 26 16:33:25 2000
>+++ graphics/png/files/patch-aa	Thu Sep  6 00:55:08 2001
>@@ -60,9 +60,9 @@
>  
> +libpng.so.${PNGVER}: $(OBJS:S/o$/so/g)
> +.if (${PORTOBJFORMAT} == "elf")
>-+	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/o$/so/g) -lz -lm
>++	${CC} -shared -Wl,-x,-soname,$@ -o $@ $(OBJS:S/o$/so/g) -lz -lm
> +.else
>-+	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz -lm
>++	${CC} -shared -Wl,-x -o $@ $(OBJS:S/o$/so/g) -lz -lm
> +.endif
> +
>  pngtest: pngtest.o libpng.a
>@@ -81,7 +81,7 @@
> +	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
> +	${BSD_INSTALL_DATA} libpng.a libpng.so.${PNGVER} $(prefix)/lib
> +	ln -sf libpng.so.${PNGVER} $(prefix)/lib/libpng.so
>-+	ranlib $(prefix)/lib/libpng.a
>++	$(RANLIB) $(prefix)/lib/libpng.a
> +	${BSD_INSTALL_MAN} libpng.3 libpngpf.3 $(prefix)/man/man3
> +	${BSD_INSTALL_MAN} png.5 $(prefix)/man/man5

Actions: View | Diff

Attachments on bug 30356: 16579