aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorGrzegorz Blach <gblach@FreeBSD.org>2014-12-27 00:09:02 +0000
committerGrzegorz Blach <gblach@FreeBSD.org>2014-12-27 00:09:02 +0000
commita781a6e13c48cdb077c68680f30716b878435448 (patch)
tree7061b4ba6bf92419cfcbfbdf988b02a781dbdcbb /graphics
parentceac9c5f821f4de7ba12309c13065316089a513f (diff)
downloadports-a781a6e13c48cdb077c68680f30716b878435448.tar.gz
ports-a781a6e13c48cdb077c68680f30716b878435448.zip
- Remove Mk/bsd.efl.mk
- Convert USE_EFL=libtool_hack to USES=libtool - Convert USE_EFL=imlib2 to LIB_DEPENDS=libImlib2.so:... - Bump PORTVERSION in graphics/imlib2 and in all ports which depends on imlib2 PR: 196062 Approved by: portmgr
Notes
Notes: svn path=/head/; revision=375663
Diffstat (limited to 'graphics')
-rw-r--r--graphics/feh/Makefile5
-rw-r--r--graphics/giblib/Makefile5
-rw-r--r--graphics/hsetroot/Makefile7
-rw-r--r--graphics/icat/Makefile4
-rw-r--r--graphics/imlib2/Makefile7
-rw-r--r--graphics/imlib2/pkg-plist3
-rw-r--r--graphics/imlib2_loaders/Makefile7
-rw-r--r--graphics/libcaca/Makefile3
-rw-r--r--graphics/maim/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile4
-rw-r--r--graphics/p5-Imlib2/Makefile5
-rw-r--r--graphics/pecl-imlib2/Makefile5
-rw-r--r--graphics/qiv/Makefile1
-rw-r--r--graphics/ruby-imlib2/Makefile5
-rw-r--r--graphics/scrot/Makefile2
-rw-r--r--graphics/simpleviewer/Makefile6
-rw-r--r--graphics/sxiv/Makefile2
-rw-r--r--graphics/telak/Makefile6
-rw-r--r--graphics/zphoto/Makefile6
19 files changed, 51 insertions, 36 deletions
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 23e41c7c1a38..2123506c9447 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -3,6 +3,7 @@
PORTNAME= feh
PORTVERSION= 2.12
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://feh.finalrewind.org/ \
${MASTER_SITE_LOCAL}
@@ -13,11 +14,11 @@ COMMENT= Image viewer that utilizes Imlib2
LICENSE= MIT
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
+ libImlib2.so:${PORTSDIR}/graphics/imlib2
USE_XORG= x11 xt xinerama
USES= gmake perl5 tar:bzip2 shebangfix desktop-file-utils
-USE_EFL= imlib2
USE_PERL5= run
CPPFLAGS+= -I${LOCALBASE}/include -std=c99
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 2bd2d4880af6..51d54d1efbc1 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= giblib
PORTVERSION= 1.2.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
@@ -13,8 +13,9 @@ COMMENT= Utility library that includes a wrapper for imlib2
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
USES= pathfix pkgconfig libtool
-USE_EFL= imlib2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_ARGS= docsdir=${DOCSDIR}
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 18c5b256d86a..5c03c981b213 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hsetroot
PORTVERSION= 1.0.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= http://cdn.thegraveyard.org/releases/hsetroot/ \
http://www.skysmurf.nl/comp/FreeBSD/distfiles/
@@ -13,11 +13,12 @@ COMMENT= Wallpaper manipulation utility for X11
LICENSE= GPLv2
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
GNU_CONFIGURE= yes
USES= gmake
-USE_EFL= imlib2
USE_XORG= x11
-LDFLAGS+= -lX11
+LDFLAGS+= -L${LOCALBASE}/lib -lX11
PLIST_FILES= bin/hsetroot
diff --git a/graphics/icat/Makefile b/graphics/icat/Makefile
index 9c4b80d8ef87..897d9e3ca200 100644
--- a/graphics/icat/Makefile
+++ b/graphics/icat/Makefile
@@ -3,13 +3,15 @@
PORTNAME= icat
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Displays images in 256-color capable terminals
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
USES= gmake dos2unix
-USE_EFL= imlib2
USE_GITHUB= yes
GH_ACCOUNT= atextor
GH_TAGNAME= v${PORTVERSION}
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index e4e8fedc48c9..7b0d2d6b6457 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= imlib2
PORTVERSION= 1.4.6
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -20,11 +20,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
GNU_CONFIGURE= yes
-USE_EFL= libtool_hack
USE_LDCONFIG= yes
-USES= pathfix pkgconfig tar:bzip2
+USES= libtool pathfix pkgconfig tar:bzip2
-CONFIGURE_ARGS+= --enable-visibility-hiding
+CONFIGURE_ARGS+= --enable-visibility-hiding --disable-static
CONFIGURE_ENV+= ac_cv_lib_dl_dlopen=no
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 7921c7dfcdbc..bf53525c7ca1 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -25,7 +25,8 @@ lib/imlib2/loaders/tga.so
lib/imlib2/loaders/xpm.so
lib/imlib2/loaders/zlib.so
lib/libImlib2.so
-lib/libImlib2.so.5
+lib/libImlib2.so.1
+lib/libImlib2.so.1.4.6
libdata/pkgconfig/imlib2.pc
%%DATADIR%%/data/fonts/cinema.ttf
%%DATADIR%%/data/fonts/grunge.ttf
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 4885936a88b5..f997af077e84 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -3,6 +3,7 @@
PORTNAME= imlib2_loaders
PORTVERSION= 1.4.6
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -17,15 +18,17 @@ LICENSE_NAME_imlib2= imlib2 license
LICENSE_FILE_imlib2= ${WRKSRC}/COPYING
LICENSE_PERMS_imlib2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
GNU_CONFIGURE= yes
-USES= pathfix pkgconfig tar:bzip2
-USE_EFL= imlib2 libtool_hack
+USES= libtool pathfix pkgconfig tar:bzip2
OPTIONS_DEFINE= EET XCF
OPTIONS_DEFAULT= EET XCF
EET_DESC= Enable eet loader
XCF_DESC= Enable XCF loader
+CONFIGURE_ARGS= --disable-static
MAKE_ENV+= INSTALL_STRIP_FLAG="${STRIP}"
.include <bsd.port.options.mk>
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index f03982ed47d1..f40d49b4dcff 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libcaca
DISTVERSION= 0.99.beta19
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/
@@ -32,7 +33,7 @@ FTGL_DESC= Freetype font rendering in OpenGL
X11_USE= XORG=x11 GL=glut
X11_CONFIGURE_OFF= --disable-x11 --disable-gl
-IMLIB2_USE= EFL=imlib2
+IMLIB2_LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
IMLIB2_CONFIGURE_ENABLE= imlib2
SLANG_LIB_DEPENDS= libslang.so.2:${PORTSDIR}/devel/libslang2
SLANG_CONFIGURE_ENABLE= slang
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index ff8f44ed0a7a..82e5472c6bbe 100644
--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@@ -2,6 +2,7 @@
PORTNAME= maim
PORTVERSION= 3.3.41
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= neel@neelc.org
@@ -9,6 +10,8 @@ COMMENT= Screenshot utility with performance improvements over scrot
LICENSE= GPLv3
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
USE_GITHUB= yes
GH_ACCOUNT= naelstrof
GH_PROJECT= maim
@@ -16,7 +19,6 @@ GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 178b253
USES= cmake
-USE_EFL= imlib2
USE_XORG= x11 xrandr xfixes
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index fa6c6c8ed7fc..bbf045b635e3 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Image-Imlib2
PORTVERSION= 2.03
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -12,10 +12,10 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the Imlib2 image library
BUILD_DEPENDS+= p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
USES= perl5
USE_PERL5= modbuild
-USE_EFL= imlib2
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index b99afbfe1d60..f360428c30c4 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Imlib2
PORTVERSION= 1.0.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics perl5
MASTER_SITES= http://www.muhri.net/
PKGNAMEPREFIX= p5-
@@ -12,7 +12,8 @@ DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl bindings for Imlib2
-USE_EFL= imlib2
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
USES= perl5
USE_PERL5= configure
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index dec568ef7f68..2fb3db9ef4a7 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= imlib2
PORTVERSION= 0.1.00
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -13,11 +13,12 @@ DIST_SUBDIR= PECL
MAINTAINER= leeym@FreeBSD.org
COMMENT= PECL extension if imlib2
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
USE_PHP= yes
USE_PHPEXT= yes
DEFAULT_PHP_VER=53
IGNORE_WITH_PHP=5
-USE_EFL= imlib2
# libImlib2 may or may not depend on X, however,
# imlib2 extension doesn't need X related functions in libImlib2
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 57eb988a033c..08f1dbbf93c9 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qiv
PORTVERSION= 2.3.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://spiegl.de/qiv/download/ \
http://www.predatorlabs.net/dl/
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index 7481b5ad7677..b3e6939a8054 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= imlib2
PORTVERSION= 0.5.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics ruby
MASTER_SITES= http://www.pablotron.org/download/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -13,11 +13,12 @@ DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
COMMENT= Imlib2 bindings for Ruby
+LIB_DEPENDS= libImlib2.so:${PORTSDIR}/graphics/imlib2
+
OPTIONS_DEFINE= DOCS EXAMPLES
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
-USE_EFL= imlib2
INSTALL_TARGET= site-install
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 136f2ee43cff..bfb43eb6ba54 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scrot
PORTVERSION= 0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index dcdf7a8bbd11..ae0129530ef6 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simpleviewer
PORTVERSION= 1.7.1553.8560
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OpenGL%20edition
DISTNAME= sviewgl-src-${PORTVERSION}
@@ -15,10 +15,10 @@ LICENSE= GPLv2
LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng.so:${PORTSDIR}/graphics/png \
- libgif.so:${PORTSDIR}/graphics/giflib
+ libgif.so:${PORTSDIR}/graphics/giflib \
+ libImlib2.so:${PORTSDIR}/graphics/imlib2
USES= tar:bzip2
-USE_EFL= imlib2
USE_GL= glut
WRKSRC= ${WRKDIR}/sviewgl-src
MAKE_ARGS= CC="${CXX}"
diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index c888a746b078..5e908778df9c 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sxiv
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://github.com/muennich/sxiv/archive/
DISTNAME= v${PORTVERSION}
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 9fde86921574..cfdaa3e563aa 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -3,7 +3,7 @@
PORTNAME= telak
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://julien.danjou.info/telak/ \
CRITICAL
@@ -14,10 +14,10 @@ COMMENT= Tool to draw pictures on your root window
LICENSE= GPLv2
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
- libgcrypt.so:${PORTSDIR}/security/libgcrypt
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+ libImlib2.so:${PORTSDIR}/graphics/imlib2
USES= gmake
-USE_EFL= imlib2
ALL_TARGET= ${PORTNAME}
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 766a5016d37d..cdb8b2f9e7f9 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zphoto
PORTVERSION= 1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,8 @@ OPTIONS_DEFAULT= ZIP
ZIP_DESC= Enable zip support
LIB_DEPENDS= libming.so:${PORTSDIR}/graphics/ming \
- libpopt.so:${PORTSDIR}/devel/popt
+ libpopt.so:${PORTSDIR}/devel/popt \
+ libImlib2.so:${PORTSDIR}/graphics/imlib2
ZIP_RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
ZIP_CONFIGURE_OFF= --disable-zip
@@ -25,7 +26,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-avifile
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-USE_EFL= imlib2
USES= perl5 gmake
USE_PERL5= build