svn commit: r337535 - branches/2014Q1/graphics/gimp-gmic-plugin

[Ruslan Makhmatkhanov]

Author: rm
Date: Thu Dec 26 15:15:25 2013
New Revision: 337535
URL: http://svnweb.freebsd.org/changeset/ports/337535

Log:
  MFH: r337236
  
  - update to 1.5.8.1
  - use options helper
  - support staging
  
  This commit also fixing build on -head, so it's a reason for MFH.
  
  Approved by:    portmgr-lurkers (mat)

Deleted:
  branches/2014Q1/graphics/gimp-gmic-plugin/pkg-plist
Modified:
  branches/2014Q1/graphics/gimp-gmic-plugin/Makefile
  branches/2014Q1/graphics/gimp-gmic-plugin/distinfo
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/graphics/gimp-gmic-plugin/Makefile
==============================================================================
--- branches/2014Q1/graphics/gimp-gmic-plugin/Makefile	Thu Dec 26 15:03:41 2013	(r337534)
+++ branches/2014Q1/graphics/gimp-gmic-plugin/Makefile	Thu Dec 26 15:15:25 2013	(r337535)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmic
-PORTVERSION=	1.5.7.1
-PORTREVISION=	2
+PORTVERSION=	1.5.8.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
@@ -21,7 +20,9 @@ LIB_DEPENDS=	libGraphicsMagick++.so:${PO
 		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
 
 OPTIONS_DEFINE=	BASH
+OPTIONS_SUB=	yes
 BASH_DESC=	Install programmable completions for Bash
+BASH_RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 OPTIONS_EXCLUDE=NLS DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
@@ -38,31 +39,27 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS:=	${CFLAGS:N-O*:N-pipe}
 CXXFLAGS:=	${CXXFLAGS:N-O*:N-pipe}
 
-MAN1=		gmic.1
-MANCOMPRESSED=	yes
-NO_STAGE=	yes
+PLIST_FILES=	bin/gmic \
+		man/man1/gmic.1.gz \
+		%%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \
+		%%PLUGIN_DIR%%/gmic_gimp
+PLIST_DIRSTRY=	%%PLUGIN_DIR%%
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MBASH}
-RUN_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-PLIST_SUB+=	BASH=""
-.else
-PLIST_SUB+=	BASH="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
 		${WRKSRC}/Makefile
 
 do-install:
-	@${MKDIR} ${PREFIX}/${PLUGIN_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${PREFIX}/${PLUGIN_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MBASH}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/gmic_bashcompletion.sh \
-		${PREFIX}/etc/bash_completion.d/gmic_bashcompletion.sh
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d
 .endif
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/graphics/gimp-gmic-plugin/distinfo
==============================================================================
--- branches/2014Q1/graphics/gimp-gmic-plugin/distinfo	Thu Dec 26 15:03:41 2013	(r337534)
+++ branches/2014Q1/graphics/gimp-gmic-plugin/distinfo	Thu Dec 26 15:15:25 2013	(r337535)
@@ -1,2 +1,2 @@
-SHA256 (gmic_1.5.7.1.tar.gz) = bc55fe0309c08fd4b4d97c37704db77965316c818c169ac573b8b12a5a44d42f
-SIZE (gmic_1.5.7.1.tar.gz) = 2174947
+SHA256 (gmic_1.5.8.1.tar.gz) = 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea
+SIZE (gmic_1.5.8.1.tar.gz) = 2265467