Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2014 16:36:55 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r339699 - branches/2014Q1/net/tcpillust
Message-ID:  <201401141636.s0EGat4j046288@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Jan 14 16:36:55 2014
New Revision: 339699
URL: http://svnweb.freebsd.org/changeset/ports/339699
QAT: https://qat.redports.org/buildarchive/r339699/

Log:
  MFH: r339688
  
  - Convert to USES=tk
  - STAGE-clean
  - Fix build
  
  Approved by:    portmgr

Modified:
  branches/2014Q1/net/tcpillust/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/tcpillust/Makefile
==============================================================================
--- branches/2014Q1/net/tcpillust/Makefile	Tue Jan 14 16:27:08 2014	(r339698)
+++ branches/2014Q1/net/tcpillust/Makefile	Tue Jan 14 16:36:55 2014	(r339699)
@@ -11,15 +11,13 @@ MASTER_SITES=	http://www.jp.nishida.org/
 MAINTAINER=	nishida@sfc.wide.ad.jp
 COMMENT=	Graphical TCP connection analysis tool
 
-USES=		motif
-USE_TCL=	yes
-USE_TK=		yes
+USES=		motif tk
 USE_XORG=	xt
 
-MAN1=		tcpillust.1
 PORTDOCS=	tcpclient.log tcpserver.log
 PLIST_DIRS=	share/tcpillust
 PLIST_FILES=	bin/tcpillust \
+		man/man1/tcpillust.1.gz \
 		share/tcpillust/tcpillust.tcl \
 		share/tcpillust/back.xbm \
 		share/tcpillust/forward.xbm \
@@ -28,24 +26,21 @@ PLIST_FILES=	bin/tcpillust \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 do-build:
 .for file in binread.c button.c draw.c parser.c tcpillust.c tcpdump/print-tcp.c
-	${CC} ${CFLAGS} -I/usr/include -I/usr/include/pcap -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
+	${CC} ${CFLAGS} -DHAVE_BPF_DUMP -I/usr/include -I/usr/include/pcap -I${LOCALBASE}/include/ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
 	-I${LOCALBASE}/include -DILTDIR=\"${DATADIR}\" -c ${WRKSRC}/${file} -o ${WRKSRC}/${file:S/.c/.o/}
 .endfor
 	${CC} ${CFLAGS} -L/lib -L/usr/lib -L${TCL_LIBDIR} -L${TK_LIBDIR} -L${LOCALBASE}/lib \
 	-lm -ltcl${TCL_VER:S/.//} -ltk${TK_VER:S/.//} ${WRKSRC}/*.o ${WRKSRC}/tcpdump/*.o -o ${WRKSRC}/tcpillust -lpcap -lX11
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpillust ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/tcpillust.tcl ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/*.xbm ${DATADIR}/
-	${INSTALL_MAN} ${WRKSRC}/tcpillust.man ${PREFIX}/man/man1/tcpillust.1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/tcpillust ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tcpillust.tcl ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/*.xbm ${STAGEDIR}${DATADIR}/
+	${INSTALL_MAN} ${WRKSRC}/tcpillust.man ${STAGEDIR}${PREFIX}/man/man1/tcpillust.1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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