diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-08-31 22:35:42 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-08-31 22:35:42 +0000 |
| commit | 1726a11fb2c85d763a6cef369262d5f9517e733e (patch) | |
| tree | 1ac2eb3166ef692b639c851013c541735b0f16f8 /net/nam | |
| parent | 16ef103bdeed135232664d3bf012020add05fe53 (diff) | |
| download | ports-1726a11fb2c85d763a6cef369262d5f9517e733e.tar.gz ports-1726a11fb2c85d763a6cef369262d5f9517e733e.zip | |
- Fix build on -current
- Fix LIB_DEPENDS
- Support CXXFLAGS properly
PR: ports/85535
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes:
svn path=/head/; revision=141648
Diffstat (limited to 'net/nam')
| -rw-r--r-- | net/nam/Makefile | 24 | ||||
| -rw-r--r-- | net/nam/files/patch-aa | 20 |
2 files changed, 10 insertions, 34 deletions
diff --git a/net/nam/Makefile b/net/nam/Makefile index 3defb454219b..3f4bcc3770d8 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -7,7 +7,7 @@ PORTNAME= nam PORTVERSION= 1.11 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.isi.edu/nsnam/dist/ DISTNAME= nam-src-${PORTVERSION} @@ -16,32 +16,28 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Animation tool for network simulation traces BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl -LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 +LIB_DEPENDS= otcl.1:${PORTSDIR}/lang/otcl -MAN1= nam.1 -MANCOMPRESSED= no +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -ALL_TARGET= # empty +MAKE_ARGS= CCOPT="${CXXFLAGS}" +ALL_TARGET= ${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${ARCH} != "i386" -BROKEN= "Does not compile" -.endif +MAN1= nam.1 post-patch: - @${REINPLACE_CMD} -e 's,friend Queue,friend class Queue,' ${WRKSRC}/queue.h + @${REINPLACE_CMD} -e 's|const = NULL|const = 0|g' ${WRKSRC}/agent.h + @${REINPLACE_CMD} -e 's|friend Queue|friend class Queue|g' ${WRKSRC}/queue.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/nam.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/nam/files/patch-aa b/net/nam/files/patch-aa deleted file mode 100644 index 83abc4219022..000000000000 --- a/net/nam/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- M Tue Jul 26 12:13:26 2005 -+++ Makefile.in Tue Jul 26 12:13:47 2005 -@@ -62,7 +62,7 @@ - - STATIC = @V_STATIC@ - DEFINE = -DTCL_TK @V_DEFINE@ @V_DEFINES@ --CFLAGS = $(CCOPT) $(DEFINE) $(INCLUDE) -+CFLAGS += $(CCOPT) $(DEFINE) $(INCLUDE) - - INSTALL = @INSTALL@ - RANLIB = @V_RANLIB@ -@@ -70,7 +70,7 @@ - BLANK = # make a blank space. DO NOT add anything to this line - AR = ar rc $(BLANK) - LINK = $(CPP) --LDFLAGS = -+LDFLAGS += - LDOUT = -o $(BLANK) - PERL = perl - RM = rm -f |