From owner-svn-ports-head@freebsd.org Thu Jun 30 20:36:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CD62B885F0; Thu, 30 Jun 2016 20:36:47 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A22221F9; Thu, 30 Jun 2016 20:36:47 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5UKakm7017990; Thu, 30 Jun 2016 20:36:46 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5UKak3b017987; Thu, 30 Jun 2016 20:36:46 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201606302036.u5UKak3b017987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 30 Jun 2016 20:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417840 - head/graphics/imlib2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2016 20:36:47 -0000 Author: zeising Date: Thu Jun 30 20:36:45 2016 New Revision: 417840 URL: https://svnweb.freebsd.org/changeset/ports/417840 Log: Update to 1.4.9 Switch to options helpers. Use install-strip instead of hand-rolling. PR: 210609 Submitted by: Dmitry Marakasov (amdmi3) Reported by: w.schwarzenfeld@utanet.at Modified: head/graphics/imlib2/Makefile head/graphics/imlib2/distinfo head/graphics/imlib2/pkg-plist Modified: head/graphics/imlib2/Makefile ============================================================================== --- head/graphics/imlib2/Makefile Thu Jun 30 20:02:43 2016 (r417839) +++ head/graphics/imlib2/Makefile Thu Jun 30 20:36:45 2016 (r417840) @@ -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/freety 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 @@ -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 Modified: head/graphics/imlib2/distinfo ============================================================================== --- head/graphics/imlib2/distinfo Thu Jun 30 20:02:43 2016 (r417839) +++ head/graphics/imlib2/distinfo Thu Jun 30 20:36:45 2016 (r417840) @@ -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 Modified: head/graphics/imlib2/pkg-plist ============================================================================== --- head/graphics/imlib2/pkg-plist Thu Jun 30 20:02:43 2016 (r417839) +++ head/graphics/imlib2/pkg-plist Thu Jun 30 20:36:45 2016 (r417840) @@ -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