From owner-svn-ports-head@FreeBSD.ORG Sat Apr 5 22:48:15 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C1CEC3E; Sat, 5 Apr 2014 22:48:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 488AB7E7; Sat, 5 Apr 2014 22:48:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35MmFbS028656; Sat, 5 Apr 2014 22:48:15 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35MmF28028655; Sat, 5 Apr 2014 22:48:15 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404052248.s35MmF28028655@svn.freebsd.org> From: Antoine Brodin Date: Sat, 5 Apr 2014 22:48:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350276 - head/graphics/ida 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.17 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: Sat, 05 Apr 2014 22:48:15 -0000 Author: antoine Date: Sat Apr 5 22:48:14 2014 New Revision: 350276 URL: http://svnweb.freebsd.org/changeset/ports/350276 QAT: https://qat.redports.org/buildarchive/r350276/ Log: - Stage support - Use new LIB_DEPENDS syntax - Use OPTIONS helpers - Use desktop-file-utils - Do not remove directory belonging to BSD.local.dist mtree Modified: head/graphics/ida/Makefile Modified: head/graphics/ida/Makefile ============================================================================== --- head/graphics/ida/Makefile Sat Apr 5 22:09:15 2014 (r350275) +++ head/graphics/ida/Makefile Sat Apr 5 22:48:14 2014 (r350276) @@ -3,7 +3,7 @@ PORTNAME= ida PORTVERSION= 2.09 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.kraxel.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} @@ -13,8 +13,8 @@ COMMENT= Small and fast motif-based imag LICENSE= GPLv2 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - exif:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libexif.so:${PORTSDIR}/graphics/libexif OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS OPTIONS_DEFAULT= GIF PNG TIFF @@ -22,65 +22,38 @@ PCD_DESC= Enable PhotoCD support SANE_DESC= Enable SANE support USE_PERL5= build -USES= iconv gmake motif perl5 +USES= desktop-file-utils iconv gmake motif perl5 MAKEFILE= GNUmakefile MAKE_ARGS= JPEG_VER=80 verbose=yes LDFLAGS+= ${ICONV_LIB} -MAN1= exiftran.1 ida.1 PORTDOCS= README TODO INSTALL PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida \ + man/man1/exiftran.1.gz man/man1/ida.1.gz \ ${DESKTOPDIR:S/${PREFIX}\///}/ida.desktop -PLIST_DIRSTRY= ${DESKTOPDIR:S/${PREFIX}\///} -NO_STAGE= yes -.include +GIB_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib +GIF_MAKE_ARGS_OFF= HAVE_LIBUNGIF=no -.if ${PORT_OPTIONS:MGIF} -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib -.else -MAKE_ARGS+= HAVE_LIBUNGIF=no -.endif - -.if ${PORT_OPTIONS:MPCD} -LIB_DEPENDS+= pcd:${PORTSDIR}/graphics/libpcd -.else -MAKE_ARGS+= HAVE_LIBPCD=no -.endif - -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -.else -MAKE_ARGS+= HAVE_LIBPNG=no -.endif - -.if ${PORT_OPTIONS:MSANE} -LIB_DEPENDS+= sane:${PORTSDIR}/graphics/sane-backends -.else -MAKE_ARGS+= HAVE_LIBSANE=no -.endif - -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -.else -MAKE_ARGS+= HAVE_LIBTIFF=no -.endif - -.if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp -.else -MAKE_ARGS+= HAVE_LIBWEBP=no -.endif +PCD_LIB_DEPENDS= libpcd.so:${PORTSDIR}/graphics/libpcd +PCD_MAKE_ARGS_OFF= HAVE_LIBPCD=no + +PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +PNG_MAKE_ARGS_OFF= HAVE_LIBPNG=no + +SANE_LIB_DEPENDS= libsane.so:${PORTSDIR}/graphics/sane-backends +SANE_MAKE_ARGS_OFF= HAVE_LIBSANE=no + +TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff +TIFF_MAKE_ARGS= HAVE_LIBTIFF=no + +WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp +WEBP_MAKE_ARGS_OFF= HAVE_LIBWEBP=no post-install: - ${MKDIR} ${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${DESKTOPDIR} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for a in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} -.endfor -.endif + ${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${STAGEDIR}${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include