Index: head/graphics/imlib2/Makefile =================================================================== --- head/graphics/imlib2/Makefile (revision 417839) +++ head/graphics/imlib2/Makefile (revision 417840) @@ -1,103 +1,72 @@ # Created by: Jeremy Norris # $FreeBSD$ PORTNAME= imlib2 -PORTVERSION= 1.4.7 +PORTVERSION= 1.4.9 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION} MAINTAINER= zeising@FreeBSD.org COMMENT= The next generation graphics library for Enlightenment LICENSE= imlib2 LICENSE_NAME= imlib2 license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept 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 .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx) CONFIGURE_ARGS+= --enable-mmx .else CONFIGURE_ARGS+= --disable-mmx .endif .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-amd64 .else 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 Index: head/graphics/imlib2/distinfo =================================================================== --- head/graphics/imlib2/distinfo (revision 417839) +++ head/graphics/imlib2/distinfo (revision 417840) @@ -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 Index: head/graphics/imlib2/pkg-plist =================================================================== --- head/graphics/imlib2/pkg-plist (revision 417839) +++ head/graphics/imlib2/pkg-plist (revision 417840) @@ -1,52 +1,53 @@ bin/imlib2-config %%X11%%bin/imlib2_bumpmap %%X11%%bin/imlib2_colorspace bin/imlib2_conv %%X11%%bin/imlib2_grab %%X11%%bin/imlib2_poly %%X11%%bin/imlib2_show %%X11%%bin/imlib2_test %%X11%%bin/imlib2_view include/Imlib2.h lib/imlib2/filters/bumpmap.so lib/imlib2/filters/colormod.so 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 lib/imlib2/loaders/lbm.so %%PNG%%lib/imlib2/loaders/png.so lib/imlib2/loaders/pnm.so lib/imlib2/loaders/tga.so %%TIFF%%lib/imlib2/loaders/tiff.so 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 %%DATADIR%%/data/fonts/morpheus.ttf %%DATADIR%%/data/fonts/notepad.ttf %%DATADIR%%/data/images/audio.png %%DATADIR%%/data/images/bg.png %%DATADIR%%/data/images/bulb.png %%DATADIR%%/data/images/cal.png %%DATADIR%%/data/images/calc.png %%DATADIR%%/data/images/folder.png %%DATADIR%%/data/images/globe.png %%DATADIR%%/data/images/imlib2.png %%DATADIR%%/data/images/lock.png %%DATADIR%%/data/images/mail.png %%DATADIR%%/data/images/menu.png %%DATADIR%%/data/images/mush.png %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/sh1.png %%DATADIR%%/data/images/sh2.png %%DATADIR%%/data/images/sh3.png %%DATADIR%%/data/images/stop.png %%DATADIR%%/data/images/tnt.png