Date: Wed, 14 Apr 2004 15:36:14 -0400 (EDT) From: Matthew George <mdg@secureworks.net> To: FreeBDS-gnats-submit@FreeBSD.org Subject: ports/65549: [MAINTAINER] net-mgmt/arpwatch-devel: use PTHREAD_* variables from bsd.port.mk Message-ID: <20040414152303.C50206@localhost> Resent-Message-ID: <200404142110.i3ELANEc029210@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65549
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/arpwatch-devel: use PTHREAD_* variables from bsd.port.mk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 14 14:10:23 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Matthew George
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
SecureWorks
>Environment:
System: FreeBSD mdg.secureworks.net 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Mon Mar 29 12:02:58 EST 2004 mdg@mdg.secureworks.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
net-mgmt/arpwatch-devel does not properly utilize the PTHREAD_*
make variables defined by Mk/bsd.port.mk. Also included is a small change
to pkg-descr, reflecting the previous category move for arpwatch. I don't
feel this is really worthy of a PORTREVISION bump, but wouldn't be opposed
to it either.
>How-To-Repeat:
>Fix:
--- Makefile.orig Wed Apr 14 15:13:09 2004
+++ Makefile Wed Apr 14 15:14:14 2004
@@ -25,6 +25,8 @@
INSTALL_TARGET= install install-man
MAN8= arpwatch.8 arpsnmp.8
+MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+
post-install:
if [ ! -d ${PREFIX}/arpwatch ]; then \
${MKDIR} ${PREFIX}/arpwatch; \
--- patch-aa.orig Wed Apr 14 15:17:35 2004
+++ patch-aa Wed Apr 14 15:16:28 2004
@@ -1,22 +1,33 @@
---- ../arpwatch.orig/Makefile.in Wed Jun 14 20:39:55 2000
-+++ ./Makefile.in Mon Sep 15 14:31:33 2003
-@@ -45,7 +45,7 @@
+--- Makefile.in.orig Wed Jun 14 20:39:55 2000
++++ Makefile.in Wed Apr 14 15:16:06 2004
+@@ -45,15 +45,15 @@
PROG = arpwatch
CCOPT = @V_CCOPT@
INCLS = -I. @V_INCLS@
-DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = @DEFS@ -pthread -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-
++DEFS = @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
+
# Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+-CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
++CFLAGS = $(CCOPT) $(PTHREAD_CFLAGS) $(DEFS) $(INCLS)
+
+ # Standard LIBS
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(PTHREAD_LIBS)
+ # Standard LIBS without libpcap.a
+-SLIBS = @LBL_LIBS@
++SLIBS = @LBL_LIBS@ $(PTHREAD_LIBS)
+
+ INSTALL = @INSTALL@
+ SENDMAIL = @V_SENDMAIL@
@@ -110,8 +110,8 @@
$(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
-
+
install: force
- $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
- $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
+ $(INSTALL) -s -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
+ $(INSTALL) -s -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
-
+
install-man: force
$(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \
--- pkg-descr.orig Wed Apr 14 15:14:36 2004
+++ pkg-descr Wed Apr 14 15:14:48 2004
@@ -5,6 +5,6 @@
move between interfaces. In addition, event processing has been
refactored, and some bugs have been fixed.
-see net/arpwatch/pkg-descr for more information about arpwatch 2.x
+see net-mgmt/arpwatch/pkg-descr for more information about arpwatch 2.x
Matthew George <mdg@secureworks.net>
--
Matthew George
SecureWorks Technical Operations
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040414152303.C50206>