From owner-svn-ports-head@freebsd.org Fri Feb 5 13:11:45 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C380B9D936D; Fri, 5 Feb 2016 13:11:45 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84739CF8; Fri, 5 Feb 2016 13:11:45 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15DBisT013667; Fri, 5 Feb 2016 13:11:44 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15DBiRr013665; Fri, 5 Feb 2016 13:11:44 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201602051311.u15DBiRr013665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 5 Feb 2016 13:11:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408185 - in head/net/sntop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2016 13:11:46 -0000 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 \