diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2007-04-16 18:40:59 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2007-04-16 18:40:59 +0000 |
| commit | 408859ab2d881b47c7876a09b5410ec4ec75b177 (patch) | |
| tree | c10d0201a9147c936fac1dec7c048ef4234682f8 /net/trafshow3 | |
| parent | 02e86e29d4aa63a46ddbe0af67c4ae396fe92060 (diff) | |
| download | ports-408859ab2d881b47c7876a09b5410ec4ec75b177.tar.gz ports-408859ab2d881b47c7876a09b5410ec4ec75b177.zip | |
- Clean up Makefile. Get rid all antique constructions.
- Fix a bug when config file was overriden [1]
Reported by: Anton Yuzhaninov (citrin@RusNet)
Notes
Notes:
svn path=/head/; revision=190140
Diffstat (limited to 'net/trafshow3')
| -rw-r--r-- | net/trafshow3/Makefile | 23 | ||||
| -rw-r--r-- | net/trafshow3/pkg-message.nodevfs | 11 | ||||
| -rw-r--r-- | net/trafshow3/pkg-plist | 2 |
3 files changed, 7 insertions, 29 deletions
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile index db4704c402f7..7ea0e8b686d7 100644 --- a/net/trafshow3/Makefile +++ b/net/trafshow3/Makefile @@ -7,7 +7,7 @@ PORTNAME= trafshow PORTVERSION= 3.1 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.sasknow.com/pub/trafshow/ \ @@ -21,23 +21,13 @@ CONFLICTS= trafshow-[45].* LATEST_LINK= trafshow3 -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -PKGMESSAGE= ${PKGDIR}/pkg-message.nodevfs -.endif - .if defined(WITH_TRAFSHOW_SLANG) || \ (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG)) LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang -.else -.if ${OSVERSION} < 400010 -LIB_DEPENDS= ncurses.5:${PORTSDIR}/devel/ncurses -.endif .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" ALL_TARGET= trafshow MAN1= trafshow.1 @@ -49,9 +39,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow.dist - ${CP} ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow -.if ${OSVERSION} < 500000 - @${CAT} ${PKGMESSAGE} -.endif + if [ ! -f ${PREFIX}/etc/trafshow ]; then \ + ${CP} ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow; \ + fi -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/trafshow3/pkg-message.nodevfs b/net/trafshow3/pkg-message.nodevfs deleted file mode 100644 index 7bb9f3d45d76..000000000000 --- a/net/trafshow3/pkg-message.nodevfs +++ /dev/null @@ -1,11 +0,0 @@ -=============================================================================== - -If trafshow displays errors similar to the following: - - ed1: (no devices found) /dev/bpf4: No such file or directory - -create more bpf devices, for instance: - - cd /dev && ./MAKEDEV bpf7 # create 8 devices - -=============================================================================== diff --git a/net/trafshow3/pkg-plist b/net/trafshow3/pkg-plist index 00f2059110f7..3add9e4fe1d1 100644 --- a/net/trafshow3/pkg-plist +++ b/net/trafshow3/pkg-plist @@ -1,4 +1,4 @@ bin/trafshow @unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi etc/trafshow.dist -@exec if [ ! -f %D/etc/trafshow.dist ]; then cp -p %D/%F %B/trafshow.dist; fi +@exec if [ ! -f %D/etc/trafshow ]; then cp -p %D/%F %B/trafshow; fi |