3 files changed, 82 insertions, 40 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 2104e4e9a2cb..14032312beca 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	1.2.2.001
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-USE_AUTOTOOLS=	autoconf:259 libltdl:15 libtool:15
-USE_GNOME=	gnomehack pkgconfig gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_LDCONFIG=	yes
 
+OPTIONS=	JPEG	"Enable jpeg image support"	on \
+		PNG	"Enable png image support"	on \
+		TIFF	"Enable tiff image support"	on \
+		GIF	"Enable GIF image support"	on \
+		ID3	"Enable IDv3 tags support"	on \
+		X11	"Enable X11 support"		on
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MMX) && (${ARCH} == "i386")
@@ -46,12 +50,50 @@ USE_XLIB=	yes
 PLIST_SUB=	X11=""
 .endif
 
+.if !defined(WITHOUT_JPEG)
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=	JPEG=""
+.else
+CONFIGURE_ARGS+=	--without-jpeg
+PLIST_SUB+=	JPEG="@comment "
+.endif
+
+.if !defined(WITHOUT_PNG)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=	PNG=""
+.else
+CONFIGURE_ARGS+=	--without-png
+PLIST_SUB+=	PNG="@comment "
+.endif
+
+.if !defined(WITHOUT_TIFF)
+LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=	TIFF=""
+.else
+CONFIGURE_ARGS+=	--without-tiff
+PLIST_SUB+=	TIFF="@comment "
+.endif
+
+.if !defined(WITHOUT_GIF)
+LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
+PLIST_SUB+=	GIF=""
+.else
+CONFIGURE_ARGS+=	--without-gif
+PLIST_SUB+=	GIF="@comment "
+.endif
+
+.if !defined(WITHOUT_ID3)
+LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
+PLIST_SUB+=	ID3=""
+.else
+CONFIGURE_ARGS+=	--without-id3
+PLIST_SUB+=	ID3="@comment "
+.endif
+
 post-patch:
+.if ${OSVERSION} < 503000
 	@${REINPLACE_CMD} -e \
 		's|round|rint|g' ${WRKSRC}/src/lib/color_helpers.c
-
-# Kludge to keep it from touching Makefile.in files (configure.in is newer)
-post-configure:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 6ff0c53efc26..2bf8dcfdc996 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2-1.2.2.001.tar.gz) = ca9ad2142464f34a5716990aa162c94f
-SHA256 (imlib2-1.2.2.001.tar.gz) = beb929f4ceff865375a9e56c0156ffbfb197dff82299071bdb641bb60299f84b
-SIZE (imlib2-1.2.2.001.tar.gz) = 944824
+MD5 (imlib2-20060926.tar.bz2) = 506262e1d17b1e402ade868010ddf465
+SHA256 (imlib2-20060926.tar.bz2) = 137f78b1de8c3c834ff836974ac05b14feb8707ee7af5458553a2b330396a86e
+SIZE (imlib2-20060926.tar.bz2) = 841866
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index c681c2b4f487..9e59bb39bb93 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,3 +1,4 @@
+bin/imlib2-config
 %%X11%%bin/imlib2_bumpmap
 %%X11%%bin/imlib2_colorspace
 bin/imlib2_conv
@@ -6,12 +7,7 @@ bin/imlib2_conv
 %%X11%%bin/imlib2_show
 %%X11%%bin/imlib2_test
 %%X11%%bin/imlib2_view
-bin/imlib2-config
 include/Imlib2.h
-lib/libImlib2.a
-lib/libImlib2.la
-lib/libImlib2.so
-lib/libImlib2.so.3
 lib/imlib2/filters/bumpmap.a
 lib/imlib2/filters/bumpmap.la
 lib/imlib2/filters/bumpmap.so
@@ -30,36 +26,40 @@ lib/imlib2/loaders/bmp.so
 lib/imlib2/loaders/bz2.a
 lib/imlib2/loaders/bz2.la
 lib/imlib2/loaders/bz2.so
-lib/imlib2/loaders/gif.a
-lib/imlib2/loaders/gif.la
-lib/imlib2/loaders/gif.so
-lib/imlib2/loaders/jpeg.a
-lib/imlib2/loaders/jpeg.la
-lib/imlib2/loaders/jpeg.so
-lib/imlib2/loaders/id3.a
-lib/imlib2/loaders/id3.la
-lib/imlib2/loaders/id3.so
+%%GIF%%lib/imlib2/loaders/gif.a
+%%GIF%%lib/imlib2/loaders/gif.la
+%%GIF%%lib/imlib2/loaders/gif.so
+%%ID3%%lib/imlib2/loaders/id3.a
+%%ID3%%lib/imlib2/loaders/id3.la
+%%ID3%%lib/imlib2/loaders/id3.so
+%%JPEG%%lib/imlib2/loaders/jpeg.a
+%%JPEG%%lib/imlib2/loaders/jpeg.la
+%%JPEG%%lib/imlib2/loaders/jpeg.so
 lib/imlib2/loaders/lbm.a
 lib/imlib2/loaders/lbm.la
 lib/imlib2/loaders/lbm.so
-lib/imlib2/loaders/png.a
-lib/imlib2/loaders/png.la
-lib/imlib2/loaders/png.so
+%%PNG%%lib/imlib2/loaders/png.a
+%%PNG%%lib/imlib2/loaders/png.la
+%%PNG%%lib/imlib2/loaders/png.so
 lib/imlib2/loaders/pnm.a
 lib/imlib2/loaders/pnm.la
 lib/imlib2/loaders/pnm.so
 lib/imlib2/loaders/tga.a
 lib/imlib2/loaders/tga.la
 lib/imlib2/loaders/tga.so
-lib/imlib2/loaders/tiff.a
-lib/imlib2/loaders/tiff.la
-lib/imlib2/loaders/tiff.so
+%%TIFF%%lib/imlib2/loaders/tiff.a
+%%TIFF%%lib/imlib2/loaders/tiff.la
+%%TIFF%%lib/imlib2/loaders/tiff.so
 lib/imlib2/loaders/xpm.a
 lib/imlib2/loaders/xpm.la
 lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.a
 lib/imlib2/loaders/zlib.la
 lib/imlib2/loaders/zlib.so
+lib/libImlib2.a
+lib/libImlib2.la
+lib/libImlib2.so
+lib/libImlib2.so.3
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf