diff options
| -rw-r--r-- | graphics/png/Makefile | 4 | ||||
| -rw-r--r-- | graphics/png/buildlink3.mk | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index fb25a727475..d51454fb116 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.87 2007/01/03 16:23:10 tv Exp $ +# $NetBSD: Makefile,v 1.88 2007/01/03 20:38:46 rillig Exp $ DISTNAME= libpng-1.2.14 PKGNAME= ${DISTNAME:S/lib//} PKGREVISION= 1 # temporary, distfile was changed after release -DIST_SUBDIR= libpng-1.2.14-20061130 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ http://www.libpng.org/pub/png/src/ \ ftp://swrinde.nde.swri.edu/pub/png/src/ \ ftp://ftp.simplesystems.org/pub/libpng/src/ \ ftp://ftp.fu-berlin.de/unix/graphics/png/src/ +DIST_SUBDIR= libpng-1.2.14-20061130 EXTRACT_SUFX= .tar.bz2 MAINTAINER= fredb@NetBSD.org diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index 518ec684459..43d7e6859f2 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/03 19:54:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/01/03 20:38:46 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+ @@ -13,16 +13,15 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}png .if !empty(PNG_BUILDLINK3_MK:M+) # XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped: -.include "../../mk/bsd.fast.prefs.mk" -.if ${OPSYS} == "Interix" -BUILDLINK_ABI_DEPENDS.png?= png>=1.2.14nb1 # fixes linkage bug -.endif +. include "../../mk/bsd.fast.prefs.mk" +. if ${OPSYS} == "Interix" +BUILDLINK_ABI_DEPENDS.png+= png>=1.2.14nb1 # fixes linkage bug +. endif BUILDLINK_API_DEPENDS.png+= png>=1.2.4 -BUILDLINK_ABI_DEPENDS.png?= png>=1.2.9nb2 +BUILDLINK_ABI_DEPENDS.png+= png>=1.2.9nb2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png -. include "../../mk/bsd.fast.prefs.mk" # keep this in sync with the same code in Makefile . if ${MACHINE_ARCH} != "i386" CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE |