3 files changed, 29 insertions, 58 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 4065448f3b8d..52cd813b9a92 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imlib2
-PORTVERSION=	1.4.7
+PORTVERSION=	1.4.9
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
@@ -19,16 +19,35 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 USES=		libtool pathfix pkgconfig tar:bzip2
 
-CONFIGURE_ARGS+=	--enable-visibility-hiding --disable-static
-CONFIGURE_ENV+=	ac_cv_lib_dl_dlopen=no
+CONFIGURE_ARGS=	--enable-visibility-hiding --disable-static
+CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
 
 OPTIONS_DEFINE=	JPEG PNG TIFF GIF ID3 X11
 OPTIONS_DEFAULT=	JPEG PNG TIFF GIF ID3 X11
+OPTIONS_SUB=	yes
+
+X11_USE=		XORG=x11,sm,xext
+X11_CONFIGURE_OFF=	--without-x
+
+JPEG_USES=		jpeg
+JPEG_CONFIGURE_OFF=	--without-jpeg
+
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_CONFIGURE_OFF=	--without-png
+
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_OFF=	--without-tiff
+
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_ARGS=	--without-gif
+
+ID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
+ID3_CONFIGURE_OFF=	--without-id3
 
 .include <bsd.port.options.mk>
 
@@ -44,60 +63,10 @@ CONFIGURE_ARGS+=	--enable-amd64
 CONFIGURE_ARGS+=	--disable-amd64
 .endif
 
-.if ! ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB=	X11="@comment "
-.else
-USE_XORG=	x11 sm xext
-PLIST_SUB=	X11=""
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-USES+=		jpeg
-PLIST_SUB+=	JPEG=""
-.else
-CONFIGURE_ARGS+=	--without-jpeg
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:graphics/png
-PLIST_SUB+=	PNG=""
-.else
-CONFIGURE_ARGS+=	--without-png
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:graphics/tiff
-PLIST_SUB+=	TIFF=""
-.else
-CONFIGURE_ARGS+=	--without-tiff
-PLIST_SUB+=	TIFF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGIF}
-LIB_DEPENDS+=	libgif.so:graphics/giflib
-PLIST_SUB+=	GIF=""
-.else
-CONFIGURE_ARGS+=	--without-gif
-PLIST_SUB+=	GIF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MID3}
-LIB_DEPENDS+=	libid3tag.so:audio/libid3tag
-PLIST_SUB+=	ID3=""
-.else
-CONFIGURE_ARGS+=	--without-id3
-PLIST_SUB+=	ID3="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MX11}
-post-patch:
+post-patch-X11-on:
 	@${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
 		${WRKSRC}/src/lib/Makefile.in
 	@${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
 		${WRKSRC}/src/lib/Imlib2.h
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 7b4f15eb9d4f..e3f1d500e135 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (imlib2-1.4.7.tar.bz2) = 35d733ce23ad7d338cff009095d37e656cb8a7a53717d53793a38320f9924701
-SIZE (imlib2-1.4.7.tar.bz2) = 889510
+TIMESTAMP = 1467226946
+SHA256 (imlib2-1.4.9.tar.bz2) = 7d2864972801823ce44ca8d5584a67a88f0e54e2bf47fa8cf4a514317b4f0021
+SIZE (imlib2-1.4.9.tar.bz2) = 892290
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index c4b9af38979d..8a2f10fff9bb 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -14,6 +14,7 @@ lib/imlib2/filters/testfilter.so
 lib/imlib2/loaders/argb.so
 lib/imlib2/loaders/bmp.so
 lib/imlib2/loaders/bz2.so
+lib/imlib2/loaders/ff.so
 %%GIF%%lib/imlib2/loaders/gif.so
 %%ID3%%lib/imlib2/loaders/id3.so
 %%JPEG%%lib/imlib2/loaders/jpeg.so
@@ -26,7 +27,7 @@ lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.so
 lib/libImlib2.so
 lib/libImlib2.so.1
-lib/libImlib2.so.1.4.7
+lib/libImlib2.so.1.4.9
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf