From owner-svn-ports-all@FreeBSD.ORG Wed Jul 10 02:28:51 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DCC688B3; Wed, 10 Jul 2013 02:28:51 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B56341CA5; Wed, 10 Jul 2013 02:28:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6A2SpTr041054; Wed, 10 Jul 2013 02:28:51 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6A2SpX1041053; Wed, 10 Jul 2013 02:28:51 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307100228.r6A2SpX1041053@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 10 Jul 2013 02:28:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322597 - head/graphics/gphoto2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2013 02:28:51 -0000 Author: danfe Date: Wed Jul 10 02:28:51 2013 New Revision: 322597 URL: http://svnweb.freebsd.org/changeset/ports/322597 Log: - Drop the article from COMMENT line - Define LICENSE (GPLv2) - Convert USE_GMAKE to USES (gmake) - Drop MAKE_JOBS_SAFE, it will soon be the default - Provide better description for AALIB option - Do not conditionally depend on graphics/jpeg; does not make sense as libgphoto2 always depends on it - Convert two ${PORT_OPTIONS:M...} into smart syntax - Do not use .for loop when installing just one file Modified: head/graphics/gphoto2/Makefile Modified: head/graphics/gphoto2/Makefile ============================================================================== --- head/graphics/gphoto2/Makefile Wed Jul 10 01:57:14 2013 (r322596) +++ head/graphics/gphoto2/Makefile Wed Jul 10 02:28:51 2013 (r322597) @@ -7,53 +7,45 @@ CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A command-line frontend to libgphoto2 +COMMENT= Command-line frontend to libgphoto2 + +LICENSE= GPLv2 LIB_DEPENDS= popt:${PORTSDIR}/devel/popt \ gphoto2:${PORTSDIR}/graphics/libgphoto2 -USES= pkgconfig +USES= gmake pkgconfig USE_BZIP2= yes -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-cdk -MAKE_JOBS_SAFE= yes - -MAN1= gphoto2.1 +# XXX: do we still need to pass PTHREAD_* stuff here? CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +MAN1= ${PORTNAME}.1 + OPTIONS_DEFINE= AALIB DOCS NLS OPTIONS_DEFAULT= AALIB -AALIB_DESC= Command line capture preview (aalib) +OPTIONS_SUB= yes -.include +AALIB_DESC= Text mode capture preview support -.if ${PORT_OPTIONS:MAALIB} -LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib \ - jpeg:${PORTSDIR}/graphics/jpeg -.else -CONFIGURE_ARGS+=--without-aalib --without-jpeg -.endif +AALIB_LIB_DEPENDS= aa:${PORTSDIR}/graphics/aalib +AALIB_CONFIGURE_ARGS= --without-aalib -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls + +.include post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREADS_LIBS:S/"//g}|g ; \ - s|-g -Wall||g' ${WRKSRC}/configure + s|-g -Wall||g' ${WRKSRC}/configure post-install: .if ${PORT_OPTIONS:MDOCS} -.for file in NEWS - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} .endif .include