summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/imlib2/Makefile29
-rw-r--r--graphics/imlib2/distinfo4
-rw-r--r--graphics/imlib2/files/patch-imlib2-config.in16
-rw-r--r--graphics/imlib2/files/patch-imlib2.pc.in9
-rw-r--r--graphics/imlib2_loaders/Makefile27
-rw-r--r--graphics/imlib2_loaders/distinfo4
-rw-r--r--graphics/imlib2_loaders/pkg-descr2
-rw-r--r--graphics/imlib2_loaders/pkg-plist1
8 files changed, 44 insertions, 48 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f9ac96a..993fd5e 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= imlib2
-PORTVERSION= 1.4.5
-PORTREVISION= 2
+PORTVERSION= 1.4.6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -12,20 +11,28 @@ MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= The next generation graphics library for Enlightenment
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= imlib2
+LICENSE_NAME= imlib2 license
+LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_PERMS= auto-accept
+
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USES= pathfix pkgconfig
USE_EFL= libtool_hack
+USE_LDCONFIG= yes
+USES= pathfix pkgconfig
+
+CONFIGURE_ARGS+= --enable-visibility-hiding
+CONFIGURE_ENV+= ac_cv_lib_dl_dlopen=no
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
+MAKE_ENV+= INSTALL_STRIP_FLAG="${STRIP}"
OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11
OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
@@ -49,7 +56,7 @@ PLIST_SUB= X11=""
.endif
.if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
.else
CONFIGURE_ARGS+= --without-jpeg
@@ -57,7 +64,7 @@ PLIST_SUB+= JPEG="@comment "
.endif
.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png
PLIST_SUB+= PNG=""
.else
CONFIGURE_ARGS+= --without-png
@@ -65,7 +72,7 @@ PLIST_SUB+= PNG="@comment "
.endif
.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff
PLIST_SUB+= TIFF=""
.else
CONFIGURE_ARGS+= --without-tiff
@@ -73,7 +80,7 @@ PLIST_SUB+= TIFF="@comment "
.endif
.if ${PORT_OPTIONS:MGIF}
-LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib
PLIST_SUB+= GIF=""
.else
CONFIGURE_ARGS+= --without-gif
@@ -81,7 +88,7 @@ PLIST_SUB+= GIF="@comment "
.endif
.if ${PORT_OPTIONS:MID3}
-LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+= libid3tag.so:${PORTSDIR}/audio/libid3tag
PLIST_SUB+= ID3=""
.else
CONFIGURE_ARGS+= --without-id3
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 8e03d91..837fddf 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (imlib2-1.4.5.tar.bz2) = 24700d93931838d2149cc2b4b58b9355cc81ec11d297f101a98dbb8d1c5c945a
-SIZE (imlib2-1.4.5.tar.bz2) = 895624
+SHA256 (imlib2-1.4.6.tar.bz2) = af51be727d62cfcff7457c753f355e44848fb997f33a7e1d43775276a9073274
+SIZE (imlib2-1.4.6.tar.bz2) = 872717
diff --git a/graphics/imlib2/files/patch-imlib2-config.in b/graphics/imlib2/files/patch-imlib2-config.in
index 2521530..183d72c 100644
--- a/graphics/imlib2/files/patch-imlib2-config.in
+++ b/graphics/imlib2/files/patch-imlib2-config.in
@@ -1,11 +1,11 @@
---- imlib2-config.in.orig Sun Jul 3 07:35:44 2005
-+++ imlib2-config.in Sun Jul 3 07:36:02 2005
-@@ -42,7 +42,7 @@
- if test @includedir@ != /usr/include ; then
- includes=-I@includedir@
- fi
-- echo $includes
-+ echo $includes @my_includes@
+--- imlib2-config.in.orig 2014-02-06 19:05:15.000000000 -0500
++++ imlib2-config.in 2014-02-06 19:05:35.000000000 -0500
+@@ -46,7 +46,7 @@
;;
--libs)
libdirs=-L@libdir@
+- echo $libdirs -lImlib2 @my_libs@
++ echo $libdirs -lImlib2
+ ;;
+ *)
+ echo "${usage}" 1>&2
diff --git a/graphics/imlib2/files/patch-imlib2.pc.in b/graphics/imlib2/files/patch-imlib2.pc.in
deleted file mode 100644
index e32e118..0000000
--- a/graphics/imlib2/files/patch-imlib2.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- imlib2.pc.in.orig Mon Feb 26 02:38:45 2007
-+++ imlib2.pc.in Mon Feb 26 02:38:57 2007
-@@ -8,5 +8,5 @@
- Requires: @requirements@
- Version: @VERSION@
- Libs: -L${libdir} -lImlib2
--Cflags: -I${includedir}
-+Cflags: -I${includedir} @my_includes@
-
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 27638af..ac909b7 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= imlib2_loaders
-PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTVERSION= 1.4.6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -12,27 +11,25 @@ MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
+LICENSE= imlib2 GPLv2
+LICENSE_COMB= multi
+LICENSE_NAME_imlib2= imlib2 license
+LICENSE_FILE_imlib2= ${WRKSRC}/COPYING
+LICENSE_PERMS_imlib2= auto-accept
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USES= pathfix
+USES= pathfix pkgconfig
USE_EFL= imlib2 libtool_hack
-OPTIONS_DEFINE= EDB EET XCF
-OPTIONS_DEFAULT= EDB EET XCF
-EDB_DESC= Enable edb loader
+OPTIONS_DEFINE= EET XCF
+OPTIONS_DEFAULT= EET XCF
EET_DESC= Enable eet loader
XCF_DESC= Enable XCF loader
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+MAKE_ENV+= INSTALL_STRIP_FLAG="${STRIP}"
-.if ${PORT_OPTIONS:MEDB}
-USE_EFL+= edb
-PLIST_SUB+= EDB=""
-.else
-CONFIGURE_ARGS+= --disable-edb
-PLIST_SUB+= EDB="@comment "
-.endif
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MEET}
USE_EFL+= eet
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 7e642d6..06053da 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,2 +1,2 @@
-SHA256 (imlib2_loaders-1.4.5.tar.bz2) = 0fbf9602d37a5caca079f85e92782273d773701f76ee03ca096dc50b625ca8d5
-SIZE (imlib2_loaders-1.4.5.tar.bz2) = 267932
+SHA256 (imlib2_loaders-1.4.6.tar.bz2) = c860e4a65934555f5526a21906e3fa623f563d7a277ee2aa6cf3c6c88b763d3a
+SIZE (imlib2_loaders-1.4.6.tar.bz2) = 281948
diff --git a/graphics/imlib2_loaders/pkg-descr b/graphics/imlib2_loaders/pkg-descr
index efb10dce..3d2f489 100644
--- a/graphics/imlib2_loaders/pkg-descr
+++ b/graphics/imlib2_loaders/pkg-descr
@@ -1,2 +1,4 @@
This package contains image loader plugins for Imlib 2 that are not dis-
tributed together with the Imlib 2 package itself.
+
+WWW: http://docs.enlightenment.org/api/imlib2/html/
diff --git a/graphics/imlib2_loaders/pkg-plist b/graphics/imlib2_loaders/pkg-plist
index b6abf93..6e61b1c 100644
--- a/graphics/imlib2_loaders/pkg-plist
+++ b/graphics/imlib2_loaders/pkg-plist
@@ -1,5 +1,4 @@
lib/imlib2/loaders/ani.so
-%%EDB%%lib/imlib2/loaders/db.so
%%EET%%lib/imlib2/loaders/eet.so
lib/imlib2/loaders/ico.so
%%XCF%%lib/imlib2/loaders/xcf.so
OpenPOWER on IntegriCloud