Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Aug 2014 17:27:02 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365109 - in head/math/gracetmpl: . files
Message-ID:  <201408161727.s7GHR2r1062523@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sat Aug 16 17:27:02 2014
New Revision: 365109
URL: http://svnweb.freebsd.org/changeset/ports/365109
QAT: https://qat.redports.org/buildarchive/r365109/

Log:
  - Enable stagedir support
  - Convert USE_PYTHON -> USES=python

Modified:
  head/math/gracetmpl/Makefile
  head/math/gracetmpl/files/patch-Makefile
  head/math/gracetmpl/pkg-plist

Modified: head/math/gracetmpl/Makefile
==============================================================================
--- head/math/gracetmpl/Makefile	Sat Aug 16 17:20:06 2014	(r365108)
+++ head/math/gracetmpl/Makefile	Sat Aug 16 17:27:02 2014	(r365109)
@@ -12,8 +12,7 @@ COMMENT=	Provide an easy way to use exis
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray
 
-USE_PYTHON=	yes
-USES=		gmake tar:bzip2
+USES=		gmake python tar:bzip2
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		BIN_PREFIX="${PREFIX}/bin" \
 		LIB_PREFIX="${PREFIX}/lib" \
@@ -24,13 +23,10 @@ MAKE_ARGS=	PREFIX="${PREFIX}" \
 		CPPFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
 		CXX="${CXX}"
 ALL_TARGET=	all pythonwrap
-INSTALL_TARGET=	install pythonwrap_install
+INSTALL_TARGET=	install
 
-INSTALLS_EGGINFO=	yes
-PYDISTUTILS_PKGNAME=	graceTMPL
-PYDISTUTILS_EGGINFODIR=	${PYTHON_SITELIBDIR}/graceTMPL
+PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 
-NO_STAGE=	yes
 post-extract:
 	@${ECHO_CMD} -n > ${WRKSRC}/Makefile.defs
 
@@ -38,9 +34,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/gracetmpl\.a|/libgracetmpl.a|g' ${WRKSRC}/gracetmpl-config.in
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}
-.endif
+	@(cd ${INSTALL_WRKSRC}/python; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \
+		install --root=${STAGEDIR} --prefix=${LOCALBASE} -c -O1)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/math/gracetmpl/files/patch-Makefile
==============================================================================
--- head/math/gracetmpl/files/patch-Makefile	Sat Aug 16 17:20:06 2014	(r365108)
+++ head/math/gracetmpl/files/patch-Makefile	Sat Aug 16 17:27:02 2014	(r365109)
@@ -8,10 +8,10 @@
 -	install -D -m 644 gracetmpl.a $(LIB_PREFIX)/gracetmpl.a
 -	install -D -m 755 gracetmpldemo $(BIN_PREFIX)/gracetmpldemo
 -	install -D -m 755 gracetmpl-config $(BIN_PREFIX)/gracetmpl-config
-+	${BSD_INSTALL_DATA} gracetmpl.h $(INC_PREFIX)/gracetmpl.h
-+	${BSD_INSTALL_DATA} gracetmpl.a $(LIB_PREFIX)/libgracetmpl.a
-+	${BSD_INSTALL_PROGRAM} gracetmpldemo $(BIN_PREFIX)/gracetmpldemo
-+	${BSD_INSTALL_SCRIPT} gracetmpl-config $(BIN_PREFIX)/gracetmpl-config
++	${BSD_INSTALL_DATA} gracetmpl.h $(DESTDIR)$(INC_PREFIX)/gracetmpl.h
++	${BSD_INSTALL_DATA} gracetmpl.a $(DESTDIR)$(LIB_PREFIX)/libgracetmpl.a
++	${BSD_INSTALL_PROGRAM} gracetmpldemo $(DESTDIR)$(BIN_PREFIX)/gracetmpldemo
++	${BSD_INSTALL_SCRIPT} gracetmpl-config $(DESTDIR)$(BIN_PREFIX)/gracetmpl-config
  
  gracetmpl-config: gracetmpl-config.in Makefile.defs
  	sed -e 's!__PREFIX__!$(PREFIX)!g' \

Modified: head/math/gracetmpl/pkg-plist
==============================================================================
--- head/math/gracetmpl/pkg-plist	Sat Aug 16 17:20:06 2014	(r365108)
+++ head/math/gracetmpl/pkg-plist	Sat Aug 16 17:27:02 2014	(r365109)
@@ -5,6 +5,7 @@ include/gracetmpl.h
 lib/libgracetmpl.a
 %%PYTHON_SITELIBDIR%%/graceTMPL/graceTMPL.so
 %%PYTHON_SITELIBDIR%%/graceTMPL.pth
+%%PYTHON_SITELIBDIR%%/graceTMPL/graceTMPL-0.3.2-py%%PYTHON_VER%%.egg-info
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/annotations.html
 %%PORTDOCS%%%%DOCSDIR%%/changes.html



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