svn commit: r408185 - in head/net/sntop: . files

[John Marino]

Author: marino
Date: Fri Feb  5 13:11:44 2016
New Revision: 408185
URL: https://svnweb.freebsd.org/changeset/ports/408185

Log:
  net/sntop: USES+= ncurses, respect LDFLAGS

Added:
  head/net/sntop/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/net/sntop/files/patch-Makefile
Modified:
  head/net/sntop/Makefile

Modified: head/net/sntop/Makefile
==============================================================================
--- head/net/sntop/Makefile	Fri Feb  5 13:11:06 2016	(r408184)
+++ head/net/sntop/Makefile	Fri Feb  5 13:11:44 2016	(r408185)
@@ -13,6 +13,7 @@ COMMENT=	Monitor status of network nodes
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		ncurses
 RUN_DEPENDS=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 
 GNU_CONFIGURE=	yes

Added: head/net/sntop/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/sntop/files/patch-Makefile.in	Fri Feb  5 13:11:44 2016	(r408185)
@@ -0,0 +1,64 @@
+--- Makefile.in.orig	2001-11-11 21:54:15 UTC
++++ Makefile.in
+@@ -36,12 +36,12 @@ DOWENEEDGETOPT = @LIBOBJS@
+ MANDIR = @mandir@/man1
+ SNTOPRC = $(ETCDIR)/sntoprc
+ CC = @CC@
+-CFLAGS = -Wall -Wstrict-prototypes -O2 @DEFS@ -DCONF_SFILE=\"$(SNTOPRC)\"
++CFLAGS+= -Wall -Wstrict-prototypes @DEFS@ -DCONF_SFILE=\"$(SNTOPRC)\"
+ 
+ proper: clean sntop
+ 
+ sntop: sntop.o
+-	$(CC) -o sntop sntop.o $(OBJS) $(LIBS)
++	$(CC) -o sntop sntop.o $(OBJS) $(LDFLAGS) $(LIBS)
+ 	@echo "sntop: done compiling, now install with 'make install'"
+ 
+ sntop.o: sntop.c
+@@ -56,34 +56,33 @@ clean:
+ 	-rm getopt_long.o
+ 
+ install: sntop
+-	@if [ -d $(INSTDIR) ]; \
++	@if [ -d $(DESTDIR)$(INSTDIR) ]; \
+ 		then \
+-		cp sntop $(INSTDIR); \
+-		chmod 755 $(INSTDIR)/sntop; \
++		cp sntop $(DESTDIR)$(INSTDIR); \
++		chmod 755 $(DESTDIR)$(INSTDIR)/sntop; \
+ 	else \
+ 		echo "sntop: $(INSTDIR) does not exist"; false; \
+ 	fi
+-	@if [ -d $(ETCDIR) ]; \
++	@if [ -d $(DESTDIR)$(ETCDIR) ]; \
+ 		then \
+-		if [ ! -f $(ETCDIR)/sntoprc ]; \
++		if [ ! -f $(DESTDIR)$(ETCDIR)/sntoprc.sample ]; \
+ 			then \
+-			cp sntoprc.EXAMPLE $(ETCDIR)/sntoprc; \
+-			chmod 644 $(ETCDIR)/sntoprc; \
++			cp sntoprc.EXAMPLE $(DESTDIR)$(ETCDIR)/sntoprc.sample; \
++			chmod 644 $(DESTDIR)$(ETCDIR)/sntoprc.sample; \
+ 		fi; \
+-		echo "sntop: Sample config exists at $(ETCDIR)/sntoprc"; \
++		echo "sntop: Sample config exists at $(ETCDIR)/sntoprc.sample"; \
+ 	else \
+ 		echo "sntop: $(ETCDIR) does not exist"; false; \
+ 	fi
+-	@if [ -d $(MANDIR) ]; \
++	@if [ -d $(DESTDIR)$(MANDIR) ]; \
+ 		then \
+-		cp sntop.1 $(MANDIR); \
+-		chmod 644 $(MANDIR)/sntop.1; \
+-		gzip -9 $(MANDIR)/sntop.1; \
++		cp sntop.1 $(DESTDIR)$(MANDIR); \
++		chmod 644 $(DESTDIR)$(MANDIR)/sntop.1; \
+ 		echo "sntop: Man file installed in $(MANDIR)"; \
+ 	else \
+ 		echo "sntop: $(MANDIR) does not exist, not installing man file"; \
+ 	fi
+-	@if [ -f $(INSTDIR)/sntop ]; \
++	@if [ -f $(DESTDIR)$(INSTDIR)/sntop ]; \
+ 		then \
+ 		echo "sntop: Executable installed in $(INSTDIR)"; \
+ 	else \