svn commit: r334301 - in head: net-mgmt/TkTopNetFlows science/omnetpp x11-toolkits/py-Pmw

[Pietro Cerutti]

Author: gahr
Date: Tue Nov 19 11:15:07 2013
New Revision: 334301
URL: http://svnweb.freebsd.org/changeset/ports/334301

Log:
  - Chase x11-toolkits/blt library name change
  - Bump PORTREVISION

Modified:
  head/net-mgmt/TkTopNetFlows/Makefile
  head/science/omnetpp/Makefile
  head/x11-toolkits/py-Pmw/Makefile

Modified: head/net-mgmt/TkTopNetFlows/Makefile
==============================================================================
--- head/net-mgmt/TkTopNetFlows/Makefile	Tue Nov 19 11:13:47 2013	(r334300)
+++ head/net-mgmt/TkTopNetFlows/Makefile	Tue Nov 19 11:15:07 2013	(r334301)
@@ -3,36 +3,39 @@
 
 PORTNAME=	TkTopNetFlows
 PORTVERSION=	0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://vfom.narod.ru/download/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	GUI tool for NetFlow data visualisation
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libBLT24.so.3:${PORTSDIR}/x11-toolkits/blt \
-		${LOCALBASE}/lib/Tktable2.10/libTktable2.10.so:${PORTSDIR}/x11-toolkits/tktable \
-		p5-Cflow>=0:${PORTSDIR}/net-mgmt/p5-Cflow
+OPTIONS_DEFINE=	DOCS
 
-NO_BUILD=	yes
-
-USE_TK=		yes
-USES=		perl5
+LIB_DEPENDS+=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt \
+		libTktable2.10.so:${PORTSDIR}/x11-toolkits/tktable
+RUN_DEPENDS=	flowdumper:${PORTSDIR}/net-mgmt/p5-Cflow
 
+NO_BUILD=	yes
+USES=		perl5 tk:85
 PORTDOCS=	*
-
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/local/bin/wish8.4|${WISH}|' \
+	    ${WRKSRC}/TkTopNetFlows.tcl
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlows.tcl ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlowsHist.tcl ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/flow_Server.pl ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/flow_Server.sh ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKSRC}/view_definitions.pl.example ${PREFIX}/etc
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}-${PORTVERSION}
-	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlows_lib.tcl ${PREFIX}/lib/${PORTNAME}-${PORTVERSION}
-.if !defined(NOPORTDOCS)
+	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlows.tcl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlowsHist.tcl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/flow_Server.pl ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/flow_Server.sh ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKSRC}/view_definitions.pl.example ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}
+	${INSTALL_SCRIPT} ${WRKSRC}/TkTopNetFlows_lib.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif

Modified: head/science/omnetpp/Makefile
==============================================================================
--- head/science/omnetpp/Makefile	Tue Nov 19 11:13:47 2013	(r334300)
+++ head/science/omnetpp/Makefile	Tue Nov 19 11:15:07 2013	(r334301)
@@ -3,7 +3,7 @@
 
 PORTNAME=	omnetpp
 PORTVERSION=	3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science
 MASTER_SITES=	http://www.omnetpp.org/download/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -15,13 +15,11 @@ COMMENT=	A discrete event simulation env
 DEPRECATED=	depends on expired textproc/libxml
 EXPIRATION_DATE=2013-12-05
 
-LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt
+LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig perl5
+USES=		gmake pkgconfig perl5 tk
 USE_GNOME=	libxml libxslt
-USE_TCL=	yes
-USE_TK=		84+
 
 USE_LDCONFIG=	yes
 

Modified: head/x11-toolkits/py-Pmw/Makefile
==============================================================================
--- head/x11-toolkits/py-Pmw/Makefile	Tue Nov 19 11:13:47 2013	(r334300)
+++ head/x11-toolkits/py-Pmw/Makefile	Tue Nov 19 11:15:07 2013	(r334301)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Pmw
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ MAINTAINER=	fmysh at iijmio-mail.jp
 COMMENT=	High-level compound graphics widgets for Python
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-LIB_DEPENDS=	BLT24.3:${PORTSDIR}/x11-toolkits/blt
+LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes