From owner-freebsd-ports Sat Feb 12 14:50:10 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by builder.freebsd.org (Postfix) with ESMTP id D395E3F7E for ; Sat, 12 Feb 2000 14:50:00 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id OAA78550; Sat, 12 Feb 2000 14:50:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from mailgw1.prontomail.com (mailgw1.prontomail.com [209.185.149.197]) by builder.freebsd.org (Postfix) with ESMTP id 635773FDE for ; Sat, 12 Feb 2000 14:44:32 -0800 (PST) Received: from mail46.prontomail.com (209.185.149.146) by mailgw1.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Sat, 12 Feb 2000 14:44:30 -0800 Received: from web04 (209.185.149.204) by mail46.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Sat, 12 Feb 2000 14:44:19 -0800 Message-Id: <7E1CEF15431E3D11787300807CFDCBC0@tkato.prontomail.ne.jp> Date: Sun, 13 Feb 2000 07:44:31 +0900 From: tkato@prontomail.ne.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16666: Update port: net/trafd Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16666 >Category: ports >Synopsis: Update port: net/trafd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 12 14:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Support CC/CFLAGS/PREFIX properly - Support install macros >How-To-Repeat: >Fix: diff -urN /usr/ports/net/trafd/patches/patch-aa net/trafd/patches/patch-aa --- /usr/ports/net/trafd/patches/patch-aa Sat Jan 29 14:37:38 2000 +++ net/trafd/patches/patch-aa Mon Jan 31 20:56:01 2000 @@ -1,21 +1,74 @@ ---- Makefile.orig Sun Jan 23 16:02:11 2000 -+++ Makefile Sun Jan 23 16:02:35 2000 -@@ -64,14 +64,14 @@ +--- Makefile.orig Thu Nov 25 20:38:29 1999 ++++ Makefile Mon Jan 31 20:55:52 2000 +@@ -12,22 +12,22 @@ + # + + # Target directory for install execution files. +-PATH_BINDIR=/usr/local/bin ++PATH_BINDIR=${PREFIX}/bin + + # Target directory for install man pages. +-PATH_MANDIR=/usr/local/man/man1 ++PATH_MANDIR=${PREFIX}/man/man1 + + # Trailing slash directory, summary traffic log files will be put there. + PATH_TOSAVE=/var/trafd/ + + # Full pathname where locate tarfstat program. +-PATH_TRAFSTAT=/usr/local/bin/trafstat ++PATH_TRAFSTAT=${PREFIX}/bin/trafstat + + # Where locate trafstatd log file, if you want log then file must exist. + PATH_TRAFSTAT_LOG=/var/log/trafstat.log + + # File with user defined descriptions of the traflog output format. +-PATH_TRAFLOG_FMT=/usr/local/etc/traflog.format ++PATH_TRAFLOG_FMT=${PREFIX}/etc/traflog.format + + # Only group wheel can execute binary files. + SHELL = /bin/sh +@@ -35,8 +35,8 @@ + GROUP = wheel + + # This options intended for BSD/OS V2. +-CC = gcc +-FLAGS = -O2 ++CC ?= gcc ++#FLAGS = -O2 + DEFINE = -DRETSIGTYPE=void -DRETSIGVAL= + #DEFINE += -DHAVE_FCNTL_H=1 + #DEFINE += -DHAVE_MEMORY_H=1 +@@ -45,7 +45,7 @@ + LDFLAGS = -L../lib -lbpft -lpcap -lcurses -ltermcap -ll + + INCLUDE = -I../include +-CFLAGS = ${FLAGS} ${INCLUDE} ${DEFINE} \ ++CFLAGS += ${FLAGS} ${INCLUDE} ${DEFINE} \ + -DPATH_TOSAVE=\"${PATH_TOSAVE}\"\ + -DPATH_TRAFSTAT=\"${PATH_TRAFSTAT}\"\ + -DPATH_TRAFSTAT_LOG=\"${PATH_TRAFSTAT_LOG}\"\ +@@ -64,15 +64,15 @@ @echo "Done." install: all - install -s -o root -g ${GROUP} -m ${MODE} trafd/trafd ${PATH_BINDIR} -+ install -c -s -o root -g ${GROUP} -m ${MODE} trafd/trafd ${PATH_BINDIR} - install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstart ${PATH_BINDIR} - install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR} - install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR} - install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR} +- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstart ${PATH_BINDIR} +- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR} +- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR} +- install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR} - install -s -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR} - install -s -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR} - install -s -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR} -+ install -c -s -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR} -+ install -c -s -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR} -+ install -c -s -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR} - install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_TRAFLOG_FMT} +- install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_TRAFLOG_FMT} ++ ${BSD_INSTALL_PROGRAM} trafd/trafd ${PATH_BINDIR} ++ ${BSD_INSTALL_SCRIPT} trafd/trafstart ${PATH_BINDIR} ++ ${BSD_INSTALL_SCRIPT} trafd/trafstop ${PATH_BINDIR} ++ ${BSD_INSTALL_SCRIPT} trafd/trafsave ${PATH_BINDIR} ++ ${BSD_INSTALL_SCRIPT} trafd/trafdump ${PATH_BINDIR} ++ ${BSD_INSTALL_PROGRAM} trafstat/trafstat ${PATH_BINDIR} ++ ${BSD_INSTALL_PROGRAM} trafstatd/trafstatd ${PATH_BINDIR} ++ ${BSD_INSTALL_PROGRAM} traflog/traflog ${PATH_BINDIR} ++ ${BSD_INSTALL_SCRIPT} traflog/traflog.format ${PATH_TRAFLOG_FMT} @echo Done. + clean: Sent by Japanese ProntoMail >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message