diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-07-04 07:13:35 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-07-04 07:13:35 +0000 |
| commit | 6db96c05006f9dc75e9717730eb1a12a7476f363 (patch) | |
| tree | 0b0138a6c6fb473a21e0292bbb3459d380585f98 /graphics | |
| parent | Add tiff2png, a TIFF-to-PNG image converter. (diff) | |
Bump png shared library version.
Submitted by: Hajimu UMEMOTO <ume@mahoroba.org>
Notes
Notes:
svn path=/head/; revision=30165
Diffstat (limited to 'graphics')
34 files changed, 40 insertions, 36 deletions
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile index 0b4d65fd474e..d9f8d3f17728 100644 --- a/graphics/EZWGL/Makefile +++ b/graphics/EZWGL/Makefile @@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png USE_X_PREFIX= yes INSTALLS_SHLIB= yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 3921b280adb9..57694a455b40 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -22,7 +22,7 @@ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ df.1:${PORTSDIR}/graphics/hdf \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ jbig.1:${PORTSDIR}/graphics/jbigkit \ ttf.4:${PORTSDIR}/print/freetype diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile index c753b02348af..4e4ed024c21e 100644 --- a/graphics/dc20ctrl/Makefile +++ b/graphics/dc20ctrl/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png MAKE_ARGS= -DUSE_JPEG -DUSE_TIFF -DUSE_PNG diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index b2f08dd217aa..c7fdbacdfbd0 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://enfle.fennel.org/ \ MAINTAINER= samy@goldmoon.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ bz2.1:${PORTSDIR}/archivers/bzip2 \ arc.1:${PORTSDIR}/archivers/libarc diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index e6f749684217..8d57c4be5dde 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index e6f749684217..8d57c4be5dde 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index e6f749684217..8d57c4be5dde 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index fba95501ce8b..fdf1716f552c 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.tuxedo.org/~esr/gif2png/ MAINTAINER= saper@system.pl -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= python:${PORTSDIR}/lang/python GNU_CONFIGURE= yes diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 3924ad384690..a6d0dd83e6c3 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index b3a696962062..cdd92ad5b079 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -15,7 +15,7 @@ MAINTAINER= dirk@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ bzip2:${PORTSDIR}/archivers/bzip2 diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 74b6503703d6..f108ba488e84 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index 74b6503703d6..f108ba488e84 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 74b6503703d6..f108ba488e84 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index cc3c903abdc9..6453397dfd67 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -14,7 +14,7 @@ DISTNAME= img${PORTVERSION} MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 57f9d6d7259b..94089979c761 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/libwmf/ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - png.3:${PORTSDIR}/graphics/png \ + png.4:${PORTSDIR}/graphics/png \ ttf.4:${PORTSDIR}/print/freetype WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index cfb7b52dddd4..a9100cc7a444 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png USE_GMAKE= yes MAKEFILE= GNUmakefile diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 350a4baffb47..1a8b1a2e4fc2 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -22,8 +22,12 @@ PATCH_SITES= ftp://ftp.libpng.org/pub/png/src/ MAINTAINER= ache@FreeBSD.org INSTALLS_SHLIB= yes +SHLIB_VER= 4 -MAN3= libpng.3 libpngpf.3 +MAKE_ENV= SHLIB_VER="${SHLIB_VER}" +PLIST_SUB= SHLIB_VER="${SHLIB_VER}" + +MAN3= libpng.4 libpngpf.3 MAN5= png.5 do-configure: diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa index d7002498835e..566d7e34121c 100644 --- a/graphics/png/files/patch-aa +++ b/graphics/png/files/patch-aa @@ -1,5 +1,5 @@ ---- scripts/makefile.std.orig Fri Jul 31 23:15:22 1998 -+++ scripts/makefile.std Sat Jan 23 14:08:51 1999 +--- scripts/makefile.std.orig Thu Dec 9 01:44:40 1999 ++++ scripts/makefile.std Tue Jul 4 09:16:46 2000 @@ -2,18 +2,30 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -8,7 +8,7 @@ +# have to change it. +# I bump PNGMAJ to 3, because imlib can't work with png 1.0.2. +# I should bump PNGMAJ for ports depend. -+PNGMAJ = 3 ++PNGMAJ = $(SHLIB_VER) +.if (${PORTOBJFORMAT} == "elf") +PNGVER = $(PNGMAJ) +.else diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index 0106ac62a87c..6ee9f0ba0b3b 100644 --- a/graphics/png/pkg-plist +++ b/graphics/png/pkg-plist @@ -1,6 +1,6 @@ include/png.h include/pngconf.h lib/libpng.a -lib/libpng.so.3 +lib/libpng.so.%%SHLIB_VER%% @exec ln -sf %f %B/libpng.so @unexec rm -f %B/libpng.so diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index b2c66f4f67e1..2ece6f1b1537 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.engr.mun.ca/~holden/ MAINTAINER= jedgar@fxp.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ gd.1:${PORTSDIR}/graphics/gd do-configure: diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 447fa3db7838..38eccdd660b9 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png DIST_SUBDIR= povray30 diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile index e3572e21fa60..e78b9200faa1 100644 --- a/graphics/povray31/Makefile +++ b/graphics/povray31/Makefile @@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz MAINTAINER= olli@fromme.com #BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png DIST_SUBDIR= povray31 diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index 447fa3db7838..38eccdd660b9 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png DIST_SUBDIR= povray30 diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 447fa3db7838..38eccdd660b9 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png DIST_SUBDIR= povray30 diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index ddadd076af10..de90b0015f60 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -16,7 +16,7 @@ DISTNAME= XaoS-${PORTVERSION} MAINTAINER= jkoshy@freebsd.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png USE_XLIB= yes diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 4eb4909d7faa..a980ae1afa48 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= jkoshy@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_IMAKE= yes diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index e842cef35a88..2c586e63b073 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ Xpm.4:${PORTSDIR}/graphics/xpm \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/xpaint USE_IMAKE= yes diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 55c39d498bef..a8c686f36469 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ sane.1:${PORTSDIR}/graphics/sane \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index f7610163e256..2280b6a6e41e 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -27,7 +27,7 @@ MAINTAINER?= shige@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.3:${PORTSDIR}/graphics/png + png.4:${PORTSDIR}/graphics/png USE_IMAKE= yes .if !defined(NOMAN) |