Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jun 2014 01:18:59 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356274 - head/science/chemtool
Message-ID:  <201406030118.s531Ixhf038938@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Jun  3 01:18:59 2014
New Revision: 356274
URL: http://svnweb.freebsd.org/changeset/ports/356274
QAT: https://qat.redports.org/buildarchive/r356274/

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax
  
  Approved by:	portmgr blanket

Modified:
  head/science/chemtool/Makefile
  head/science/chemtool/pkg-plist

Modified: head/science/chemtool/Makefile
==============================================================================
--- head/science/chemtool/Makefile	Tue Jun  3 01:15:13 2014	(r356273)
+++ head/science/chemtool/Makefile	Tue Jun  3 01:18:59 2014	(r356274)
@@ -19,24 +19,21 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-emf=yes --with-localedir=${PREFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 #isolate libEMF stuff
-LIB_DEPENDS+=	EMF.1:${PORTSDIR}/graphics/libemf
-CFLAGS+=	 -I${LOCALBASE}/include/libEMF
-
-MAN1=	chemtool.1 cht.1
+LIB_DEPENDS+=	libEMF.so:${PORTSDIR}/graphics/libemf
+CFLAGS+=	-I${LOCALBASE}/include/libEMF
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/chemtool ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src-cht/cht ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/chemtool.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/cht.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/chemtool ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src-cht/cht ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/chemtool.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/cht.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/science/chemtool/pkg-plist
==============================================================================
--- head/science/chemtool/pkg-plist	Tue Jun  3 01:15:13 2014	(r356273)
+++ head/science/chemtool/pkg-plist	Tue Jun  3 01:18:59 2014	(r356274)
@@ -1,5 +1,7 @@
 bin/chemtool
 bin/cht
+man/man1/chemtool.1.gz
+man/man1/cht.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/14263232.mol
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AMP.cht
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adenosine.cht



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