diff --git a/sysutils/tcplist/Makefile b/sysutils/tcplist/Makefile index 85d010f5a20d..77e2aba6f32d 100644 --- a/sysutils/tcplist/Makefile +++ b/sysutils/tcplist/Makefile @@ -1,19 +1,19 @@ PORTNAME= tcplist PORTVERSION= 2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils net MASTER_SITES= ftp://ftp.cdf.toronto.edu/pub/jdd/tcplist/ EXTRACT_SUFX= .shar MAINTAINER= ports@FreeBSD.org COMMENT= Lists TCP connections to/from local machine (+username on both sides) RUN_DEPENDS= ${LOCALBASE}/sbin/lsof:sysutils/lsof EXTRACT_CMD= ${CAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= |sh NO_WRKSUBDIR= yes INSTALL_TARGET= install install.man .include diff --git a/sysutils/tcplist/files/patch-Makefile b/sysutils/tcplist/files/patch-Makefile index 749df806f963..9ad9971a4552 100644 --- a/sysutils/tcplist/files/patch-Makefile +++ b/sysutils/tcplist/files/patch-Makefile @@ -1,77 +1,77 @@ --- Makefile.orig 2014-09-08 12:18:04 UTC +++ Makefile @@ -1,14 +1,16 @@ # Compiler: eg. cc or gcc CC = cc +#PREFIX= /local + # Directory to install tcplist executable -BINDIR = /local/bin +BINDIR = $(PREFIX)/bin # Directory to install tcplist man page -MANDIR = /local/man/man1 -+MANDIR = $(PREFIX)/man/man1 ++MANDIR = $(PREFIX)/share/man/man1 # Location of NOIDENT file -NOIDENT = /etc/hosts.noident +NOIDENT = $(PREFIX)/etc/hosts.noident # Owner of tcplist executable OWNER = root @@ -45,18 +47,18 @@ # # Solaris 2.x (using LSOF): # -LIBRARIES = -lsocket -lnsl -DEFS = -DLSOF -MODE = 755 -GROUP = staff +#LIBRARIES = -lsocket -lnsl +#DEFS = -DLSOF +#MODE = 755 +#GROUP = staff # # Generic LSOF: # -# LIBRARIES = -# DEFS = -DLSOF -# MODE = 755 -# GROUP = staff + LIBRARIES = + DEFS = -DLSOF + MODE = 755 + GROUP = staff # # If you're using an old version of lsof, uncomment this: @@ -76,8 +78,8 @@ RM = /bin/rm -rf CP = /bin/cp CHMOD = /bin/chmod -CHOWN = /bin/chown -CHGRP = /bin/chgrp +CHOWN = /usr/sbin/chown +CHGRP = /usr/bin/chgrp all:: tcplist @@ -94,14 +96,10 @@ makedepend -- $(CFLAGS) -- $(SRCS) install: tcplist - strip tcplist - $(CP) tcplist $(BINDIR) - $(CHGRP) $(GROUP) $(BINDIR)/tcplist - $(CHMOD) $(MODE) $(BINDIR)/tcplist + $(BSD_INSTALL_PROGRAM) tcplist $(DESTDIR)$(BINDIR)/tcplist install.man: tcplist.1 - $(CP) tcplist.1 $(MANDIR)/tcplist.$(MANEXT) - $(CHMOD) $(MANMODE) $(MANDIR)/tcplist.$(MANEXT) + $(BSD_INSTALL_MAN) tcplist.1 $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) shar: shar `awk '{print $$1}' MANIFEST` >tcplist-`awk '{print $$7;exit}' patchlevel.h`.shar diff --git a/sysutils/tcplist/pkg-plist b/sysutils/tcplist/pkg-plist index 62295c115b9c..18d621d46bff 100644 --- a/sysutils/tcplist/pkg-plist +++ b/sysutils/tcplist/pkg-plist @@ -1,2 +1,2 @@ bin/tcplist -man/man1/tcplist.1.gz +share/man/man1/tcplist.1.gz