svn commit: r322597 - head/graphics/gphoto2

[Alexey Dokuchaev]

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 at 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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>