Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jun 2014 07:52:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356748 - head/devel/gaphor
Message-ID:  <201406060752.s567qIbi083761@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Jun  6 07:52:18 2014
New Revision: 356748
URL: http://svnweb.freebsd.org/changeset/ports/356748
QAT: https://qat.redports.org/buildarchive/r356748/

Log:
  devel/gaphor: Add stage support and remove infozip dependency
  
  This port doesn't need any special extraction handling, TAR puts
  everything where it needs to be by default.  Remove the unnecessary
  post-extract target while staging the port.

Modified:
  head/devel/gaphor/Makefile

Modified: head/devel/gaphor/Makefile
==============================================================================
--- head/devel/gaphor/Makefile	Fri Jun  6 07:42:00 2014	(r356747)
+++ head/devel/gaphor/Makefile	Fri Jun  6 07:52:18 2014	(r356748)
@@ -12,24 +12,20 @@ DISTFILES=	${DOCKING_DISTNAME}${EXTRACT_
 		${GAPHAS_DISTNAME}${EXTRACT_SUFX}:gaphas \
 		${SGENERIC_DISTNAME}.zip:sgeneric \
 		${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DOCKING_DISTNAME}${EXTRACT_SUFX} \
-		${GAPHAS_DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UML modeling environment written in Python
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
 		${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:${PORTSDIR}/devel/py-zope.component
 
-USE_GNOME=	pygtk2
-USE_PYTHON=	yes
+USE_GNOME=		pygtk2
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
-INSTALLS_ICONS=	yes
+INSTALLS_ICONS=		yes
 
 PLIST_SUB=	DOCKING_EGG="${DOCKING_EGG}" GAPHAS_EGG="${GAPHAS_EGG}"
 
@@ -38,10 +34,7 @@ DOCKING_EGG=		${DOCKING_DISTNAME}-py${PY
 GAPHAS_DISTNAME=	gaphas-0.7.2
 GAPHAS_EGG=		${GAPHAS_DISTNAME}-py${PYTHON_VER}.egg
 SGENERIC_DISTNAME=	simplegeneric-0.8.1
-
-NO_STAGE=	yes
-post-extract:
-	@${UNZIP_CMD} -qo ${DISTDIR}/${SGENERIC_DISTNAME}.zip -d ${WRKDIR}
+HICOLORDIR=		${STAGEDIR}${PREFIX}/share/icons/hicolor
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -56,21 +49,21 @@ post-build:
 	@${PYTHON_CMD} -O -m compileall ${WRKDIR}/${SGENERIC_DISTNAME}
 
 post-install:
-	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${DOCKING_EGG}
-	@(cd ${WRKDIR}/${DOCKING_DISTNAME}/lib && ${COPYTREE_SHARE} etk \
-		${PYTHONPREFIX_SITELIBDIR}/${DOCKING_EGG})
-	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${GAPHAS_EGG}
-	@(cd ${WRKDIR}/${GAPHAS_DISTNAME} && ${COPYTREE_SHARE} gaphas \
-		${PYTHONPREFIX_SITELIBDIR}/${GAPHAS_EGG})
-	@(cd ${WRKDIR}/${SGENERIC_DISTNAME} && ${INSTALL_DATA} \
-		simplegeneric.py* ${PYTHONPREFIX_SITELIBDIR})
-	@${MKDIR} ${DESKTOPDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} gaphor.desktop ${DESKTOPDIR})
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${DOCKING_EGG} \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${GAPHAS_EGG} \
+		${STAGEDIR}${DESKTOPDIR}
+	(cd ${WRKDIR}/${DOCKING_DISTNAME}/lib && ${COPYTREE_SHARE} etk \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${DOCKING_EGG})
+	(cd ${WRKDIR}/${GAPHAS_DISTNAME} && ${COPYTREE_SHARE} gaphas \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${GAPHAS_EGG})
+	(cd ${WRKDIR}/${SGENERIC_DISTNAME} && ${INSTALL_DATA} \
+		simplegeneric.py* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} gaphor.desktop \
+		${STAGEDIR}${DESKTOPDIR})
 .for i in 24 48 96 256
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+	@${MKDIR} ${HICOLORDIR}/${i}x${i}/apps
 	(cd ${WRKSRC}/gaphor/ui/pixmaps && ${INSTALL_DATA} \
-		gaphor-${i}x${i}.png \
-		${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gaphor.png)
+		gaphor-${i}x${i}.png ${HICOLORDIR}/${i}x${i}/apps/gaphor.png)
 .endfor
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406060752.s567qIbi083761>