From 00789911dc825bb8e782673bedf5a3b0f225be7b Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Fri, 19 Sep 2014 20:43:03 +0000 Subject: [PATCH] graphics/imlib: - Remove :oldver from USES=libtool and bump dependent ports --- editors/zoinks/Makefile | 1 + games/hex/Makefile | 2 +- graphics/bbrb/Makefile | 2 +- graphics/gimageview/Makefile | 2 +- graphics/gtkgraph/Makefile | 2 +- graphics/imagesort/Makefile | 2 +- graphics/imlib/Makefile | 10 ++-------- graphics/imlib/pkg-plist | 16 ++++------------ graphics/kuickshow-kde4/Makefile | 2 +- graphics/picturebook/Makefile | 2 +- graphics/pixelize/Makefile | 2 +- graphics/show/Makefile | 2 +- graphics/xzgv/Makefile | 2 +- japanese/ebview/Makefile | 2 +- japanese/netype/Makefile | 2 +- japanese/xjtext/Makefile | 2 +- misc/magicpoint/Makefile | 2 +- sysutils/usbhotkey/Makefile | 1 + x11-wm/fvwm2/Makefile | 2 +- x11/metisse/Makefile | 2 +- x11/peeper/Makefile | 2 +- 21 files changed, 25 insertions(+), 37 deletions(-) diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile index a5e617af3517..a29993ab6d20 100644 --- a/editors/zoinks/Makefile +++ b/editors/zoinks/Makefile @@ -3,6 +3,7 @@ PORTNAME= zoinks PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://zoinks.mikelockwood.com/download/ diff --git a/games/hex/Makefile b/games/hex/Makefile index 0b57fb550ded..ca62ec3b4e81 100644 --- a/games/hex/Makefile +++ b/games/hex/Makefile @@ -3,7 +3,7 @@ PORTNAME= hex PORTVERSION= 0.0.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://www.earth.li/projectpurple/files/ diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile index 65700ce8d85d..e84c23580035 100644 --- a/graphics/bbrb/Makefile +++ b/graphics/bbrb/Makefile @@ -3,7 +3,7 @@ PORTNAME= bbrb PORTVERSION= 0.4.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index b34633348cd8..41a12c4a3a1c 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -3,7 +3,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION} diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 8cd338fa7a9a..421462030afa 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtkgraph PORTVERSION= 0.6.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jedgar diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index e103a4417b9b..82dd96ba06a8 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -3,7 +3,7 @@ PORTNAME= imagesort PORTVERSION= 2.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SUNSITE/apps/graphics/viewers/X diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 7c545b176a54..e8b9cc50de16 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -16,19 +16,13 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libgif.so:${PORTSDIR}/graphics/giflib -# TODO: Remove :oldver together with version-info patching in pre-configure. -USES= gmake libtool:oldver pathfix tar:bzip2 +USES= gmake libtool pathfix tar:bzip2 USE_XORG= sm xext x11 USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/imlib --disable-modules CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 -LDFLAGS+= -L${LOCALBASE}/lib - -pre-configure: - @${REINPLACE_CMD} -e "s|10:15:9|5:0:0|" ${WRKSRC}/*/Makefile.in - @${REINPLACE_CMD} -e "s|glib-config|${GLIB_CONFIG}|" ${WRKSRC}/configure - @${REINPLACE_CMD} -e "s|@SUPPORT_LIBS@|-L${LOCALBASE}/lib @SUPPORT_LIBS@|" ${WRKSRC}/imlib-config.in +LIBS+= -L${LOCALBASE}/lib .include diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist index fc7fdb03c134..f3267705a527 100644 --- a/graphics/imlib/pkg-plist +++ b/graphics/imlib/pkg-plist @@ -11,36 +11,28 @@ include/gdk_imlib.h include/gdk_imlib_private.h include/gdk_imlib_types.h lib/libImlib.a -lib/libImlib.la lib/libImlib.so -lib/libImlib.so.5 +lib/libImlib.so.1 +lib/libImlib.so.1.9.15 lib/libgdk_imlib.a -lib/libgdk_imlib.la lib/libgdk_imlib.so -lib/libgdk_imlib.so.5 +lib/libgdk_imlib.so.1 +lib/libgdk_imlib.so.1.9.15 lib/libimlib-bmp.a -lib/libimlib-bmp.la lib/libimlib-bmp.so lib/libimlib-gif.a -lib/libimlib-gif.la lib/libimlib-gif.so lib/libimlib-jpeg.a -lib/libimlib-jpeg.la lib/libimlib-jpeg.so lib/libimlib-png.a -lib/libimlib-png.la lib/libimlib-png.so lib/libimlib-ppm.a -lib/libimlib-ppm.la lib/libimlib-ppm.so lib/libimlib-ps.a -lib/libimlib-ps.la lib/libimlib-ps.so lib/libimlib-tiff.a -lib/libimlib-tiff.la lib/libimlib-tiff.so lib/libimlib-xpm.a -lib/libimlib-xpm.la lib/libimlib-xpm.so libdata/pkgconfig/imlib.pc libdata/pkgconfig/imlibgdk.pc diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index 8a441b2ac6c2..ae99b431c8b6 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kuickshow PORTVERSION= ${APP_VER}.${EXTRA_VER} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/extragear DISTNAME= ${PORTNAME}-${APP_VER}-kde${EXTRA_VER} diff --git a/graphics/picturebook/Makefile b/graphics/picturebook/Makefile index fc097efe893f..ac2d860009bb 100644 --- a/graphics/picturebook/Makefile +++ b/graphics/picturebook/Makefile @@ -3,7 +3,7 @@ PORTNAME= picturebook PORTVERSION= 20010422 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://samba.org/picturebook/ DISTNAME= capture diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile index be05acbbc229..3236487097a0 100644 --- a/graphics/pixelize/Makefile +++ b/graphics/pixelize/Makefile @@ -3,7 +3,7 @@ PORTNAME= pixelize PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://lashwhip.com/pub/ \ http://www.c-s.li/ports/ \ diff --git a/graphics/show/Makefile b/graphics/show/Makefile index b9e0dcc81309..bf77f31c258e 100644 --- a/graphics/show/Makefile +++ b/graphics/show/Makefile @@ -3,7 +3,7 @@ PORTNAME= show PORTVERSION= 2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.ibiblio.org/propaganda/ \ http://www.freebsdbrasil.com.br/~jmelo/ diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 966415543dda..fb0ca9b3b189 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -3,7 +3,7 @@ PORTNAME= xzgv PORTVERSION= 0.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile index ed4460b22472..3a672d471468 100644 --- a/japanese/ebview/Makefile +++ b/japanese/ebview/Makefile @@ -2,7 +2,7 @@ PORTNAME= ebview PORTVERSION= 0.2.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= japanese MASTER_SITES= SF diff --git a/japanese/netype/Makefile b/japanese/netype/Makefile index c5a15d8d2dd2..f6d708216ab7 100644 --- a/japanese/netype/Makefile +++ b/japanese/netype/Makefile @@ -3,7 +3,7 @@ PORTNAME= netype PORTVERSION= 0.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= japanese MASTER_SITES= http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/ DISTNAME= ${PORTNAME}-0.1.0 diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile index d20e421c1166..299166275e6c 100644 --- a/japanese/xjtext/Makefile +++ b/japanese/xjtext/Makefile @@ -3,7 +3,7 @@ PORTNAME= xjtext PORTVERSION= 1.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= japanese MASTER_SITES= http://plaza.harmonix.ne.jp/~onizuka/ DISTNAME= XJTEXT-${PORTVERSION} diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 3ffd60c6d755..ec5f78f74bc6 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -3,7 +3,7 @@ PORTNAME= magicpoint PORTVERSION= 1.13a -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES?= misc MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile index 7174579853a1..b262bb930a04 100644 --- a/sysutils/usbhotkey/Makefile +++ b/sysutils/usbhotkey/Makefile @@ -3,6 +3,7 @@ PORTNAME= usbhotkey PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index cf07937da215..ee3a6ea19563 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -3,7 +3,7 @@ PORTNAME= fvwm PORTVERSION= 2.6.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile index 992aaca6bd1e..9dc00ea63811 100644 --- a/x11/metisse/Makefile +++ b/x11/metisse/Makefile @@ -3,7 +3,7 @@ PORTNAME= metisse PORTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://insitu.lri.fr/metisse/download/metisse/ diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile index 1fb6f7bea3ed..e3648f6eff3a 100644 --- a/x11/peeper/Makefile +++ b/x11/peeper/Makefile @@ -3,7 +3,7 @@ PORTNAME= peeper PORTVERSION= 0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11 MASTER_SITES= http://peeper.sourceforge.net/