diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-03-23 15:34:30 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-03-23 15:34:30 +0000 |
| commit | 4f9ba7798c66cfcb4cf50c026d85732e1f6369a6 (patch) | |
| tree | b47aef7f5088380d0cf8f3f5641b34ae7633ee02 /net | |
| parent | PR: (diff) | |
unbreak tcpview on alpha
Noticed by: kris and bento
Notes
Notes:
svn path=/head/; revision=77262
Diffstat (limited to 'net')
| -rw-r--r-- | net/tcpview/Makefile | 12 | ||||
| -rw-r--r-- | net/tcpview/files/patch-Makefile | 14 | ||||
| -rw-r--r-- | net/tcpview/files/patch-aa | 15 | ||||
| -rw-r--r-- | net/tcpview/pkg-plist | 2 |
4 files changed, 18 insertions, 25 deletions
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile index c598df6d1842..edceb69a1fd1 100644 --- a/net/tcpview/Makefile +++ b/net/tcpview/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: tcpview-1.0 +# New ports collection makefile for: tcpview # Date created: 18 Aug 2000 # Whom: Chung-Kie Tung <tung@turtle.ee.ncku.edu.tw> # @@ -18,20 +18,14 @@ USE_BISON= yes USE_MOTIF= yes USE_REINPLACE= yes -MAKE_ARGS= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_MAN="${INSTALL_MAN}" \ - INSTALL_DATA="${INSTALL_DATA}" \ - PREFIX="${PREFIX}" \ - X11BASE="${X11BASE}" - MAN1= tcpview.1 post-patch: .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c @${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f} .endfor - + post-install: - ${CP} ${WRKSRC}/DOC/Tcpview ${X11BASE}/lib/X11/app-defaults/ + ${INSTALL_DATA} ${WRKSRC}/DOC/Tcpview ${X11BASE}/lib/X11/app-defaults/ .include <bsd.port.mk> diff --git a/net/tcpview/files/patch-Makefile b/net/tcpview/files/patch-Makefile index 51cf1a42e58e..5c1862c17eef 100644 --- a/net/tcpview/files/patch-Makefile +++ b/net/tcpview/files/patch-Makefile @@ -115,19 +115,19 @@ - install -m 755 -g $(GROUP) BGP $(FILTER_DIR); \ - install -m 755 -g $(GROUP) telnet $(FILTER_DIR); \ - install -m 755 -g $(GROUP) generic $(FILTER_DIR); \ -+ ${INSTALL_PROGRAM} -c tcpview $(DESTDIR)$(BINDEST); \ -+ ${INSTALL_PROGRAM} -c BGP $(FILTER_DIR); \ -+ ${INSTALL_PROGRAM} -c telnet $(FILTER_DIR); \ -+ ${INSTALL_PROGRAM} -c generic $(FILTER_DIR); \ ++ ${BSD_INSTALL_PROGRAM} -c tcpview $(DESTDIR)$(BINDEST); \ ++ ${BSD_INSTALL_PROGRAM} -c BGP $(FILTER_DIR); \ ++ ${BSD_INSTALL_PROGRAM} -c telnet $(FILTER_DIR); \ ++ ${BSD_INSTALL_PROGRAM} -c generic $(FILTER_DIR); \ cd ../DOC ; \ - install -m 666 -c hosts $(TCPVIEW_DIR); \ - install -m 666 -c manuf $(TCPVIEW_DIR); \ - install -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \ - install -c tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \ - install -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST) -+ ${INSTALL_DATA} -c hosts $(TCPVIEW_DIR); \ -+ ${INSTALL_DATA} -c manuf $(TCPVIEW_DIR); \ -+ ${INSTALL_MAN} -c tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \ ++ ${BSD_INSTALL_DATA} -c hosts $(TCPVIEW_DIR); \ ++ ${BSD_INSTALL_DATA} -c manuf $(TCPVIEW_DIR); \ ++ ${BSD_INSTALL_MAN} -c tcpview.1 $(DESTDIR)$(TCPVIEW_MANDEST); \ +# install -m 444 -c tcpdump.1 $(DESTDIR)$(TCPDUMP_MANDEST); \ +# install -m 444 -c tcpslice.1 $(DESTDIR)$(TCPSLICE_MANDEST) diff --git a/net/tcpview/files/patch-aa b/net/tcpview/files/patch-aa index bc71bbdcc44e..e2c09be5872a 100644 --- a/net/tcpview/files/patch-aa +++ b/net/tcpview/files/patch-aa @@ -87,17 +87,16 @@ +*/ +/* unsigned 32-bit integer */ +#endif ---- mdtype Mon Feb 17 13:29:48 1992 -+++ mdtype Tue Feb 25 23:35:31 1997 -@@ -7,10 +7,18 @@ +--- mdtype.orig Mon Feb 17 13:29:48 1992 ++++ mdtype Fri Mar 14 23:06:11 2003 +@@ -5,12 +5,15 @@ + # + set mach="UNKNOWN" if ( -f /bin/arch ) set mach=`/bin/arch` - if ($mach == "UNKNOWN") then - set temp=`machine` +-if ($mach == "UNKNOWN") then +- set temp=`machine` - if ($temp != "") set mach=$temp -endif -+ if ($temp != "") set mach=$temp -+endif -+ # Hack, hack... if ($mach == "sparc") set mach=sun4 + diff --git a/net/tcpview/pkg-plist b/net/tcpview/pkg-plist index 4385896e5aca..5d32a20d72bf 100644 --- a/net/tcpview/pkg-plist +++ b/net/tcpview/pkg-plist @@ -6,5 +6,5 @@ lib/tcpview/hosts lib/tcpview/manuf @dirrm lib/tcpview/filters @dirrm lib/tcpview -@cwd /usr/X11R6 +@cwd %%X11BASE%% lib/X11/app-defaults/Tcpview |