Date: Tue, 8 Feb 2000 22:20:13 -0500 (EST)
From: cjm2@altavista.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: ports/16595: Made port use ${PREFIX}
Message-ID: <200002090320.WAA27323@weeble.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 16595
>Category: ports
>Synopsis: Made port use ${PREFIX}
>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: Wed Feb 9 03:30:20 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Christopher J. Michaels
>Release: FreeBSD 3.4-STABLE i386
>Organization:
>Environment:
FreeBSD 3.4-STABLE
>Description:
Changed port to use ${PREFIX}
Changed to use ${CFLAGS} in /etc/make.conf
Added do-install:, so proper INSTALL macros could be used
>How-To-Repeat:
See Fix:
>Fix:
diff -ruN trafd.bak/Makefile trafd/Makefile
--- trafd.bak/Makefile Sat Jan 29 00:37:36 2000
+++ trafd/Makefile Tue Feb 8 22:10:51 2000
@@ -13,10 +13,22 @@
MAINTAINER= ports@FreeBSD.org
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/trafd/trafd ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/trafd/trafstart ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/trafd/trafstop ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/trafd/trafsave ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/trafd/trafdump ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/trafstat/trafstat ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/trafstatd/trafstatd ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/traflog/traflog ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/traflog/traflog.format ${PREFIX}/etc
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/bpft
${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bpft/README
.endif
-
+ ${MKDIR} ${PREFIX}/var/trafd
+ ${MKDIR} ${PREFIX}/var/log
.include <bsd.port.mk>
diff -ruN trafd.bak/patches/patch-aa trafd/patches/patch-aa
--- trafd.bak/patches/patch-aa Sat Jan 29 00:37:38 2000
+++ trafd/patches/patch-aa Tue Feb 8 21:58:10 2000
@@ -1,21 +1,49 @@
---- Makefile.orig Sun Jan 23 16:02:11 2000
-+++ Makefile Sun Jan 23 16:02:35 2000
-@@ -64,14 +64,14 @@
- @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 -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}
- @echo Done.
+--- Makefile.orig Tue Feb 8 21:57:24 2000
++++ Makefile Tue Feb 8 21:34:45 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=${MANPREFIX}/man1
+
+ # Trailing slash directory, summary traffic log files will be put there.
+-PATH_TOSAVE=/var/trafd/
++PATH_TOSAVE=${PREFIX}/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
++PATH_TRAFSTAT_LOG=${PREFIX}/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
+@@ -36,7 +36,7 @@
+
+ # This options intended for BSD/OS V2.
+ CC = gcc
+-FLAGS = -O2
++#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 += ${INCLUDE} ${DEFINE} \
+ -DPATH_TOSAVE=\"${PATH_TOSAVE}\"\
+ -DPATH_TRAFSTAT=\"${PATH_TRAFSTAT}\"\
+ -DPATH_TRAFSTAT_LOG=\"${PATH_TRAFSTAT_LOG}\"\
diff -ruN trafd.bak/patches/patch-ab trafd/patches/patch-ab
--- trafd.bak/patches/patch-ab Wed Dec 31 19:00:00 1969
+++ trafd/patches/patch-ab Tue Feb 8 00:22:23 2000
@@ -0,0 +1,7 @@
+--- trafd/trafdump.orig Tue Feb 8 00:14:22 2000
++++ trafd/trafdump Tue Feb 8 00:15:05 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # trafdump Copyright (c)1993 CAD lab
+ #
diff -ruN trafd.bak/patches/patch-ac trafd/patches/patch-ac
--- trafd.bak/patches/patch-ac Wed Dec 31 19:00:00 1969
+++ trafd/patches/patch-ac Tue Feb 8 00:22:20 2000
@@ -0,0 +1,7 @@
+--- trafd/trafsave.orig Tue Feb 8 00:14:31 2000
++++ trafd/trafsave Tue Feb 8 00:15:15 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # trafsave Copyright (c)1993 CAD lab
+ #
diff -ruN trafd.bak/patches/patch-ad trafd/patches/patch-ad
--- trafd.bak/patches/patch-ad Wed Dec 31 19:00:00 1969
+++ trafd/patches/patch-ad Tue Feb 8 00:22:35 2000
@@ -0,0 +1,7 @@
+--- trafd/trafstart.orig Tue Feb 8 00:14:42 2000
++++ trafd/trafstart Tue Feb 8 00:15:38 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # trafstart Copyright (c)1993 CAD lab
+ #
diff -ruN trafd.bak/patches/patch-ae trafd/patches/patch-ae
--- trafd.bak/patches/patch-ae Wed Dec 31 19:00:00 1969
+++ trafd/patches/patch-ae Tue Feb 8 00:22:47 2000
@@ -0,0 +1,7 @@
+--- trafd/trafstop.orig Tue Feb 8 00:14:49 2000
++++ trafd/trafstop Tue Feb 8 00:15:51 2000
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # trafstop Copyright (c)1993 CAD lab
+ #
diff -ruN trafd.bak/pkg/PLIST trafd/pkg/PLIST
--- trafd.bak/pkg/PLIST Sat Jan 29 00:37:41 2000
+++ trafd/pkg/PLIST Tue Feb 8 22:10:43 2000
@@ -9,3 +9,4 @@
etc/traflog.format
share/doc/bpft/README
@dirrm share/doc/bpft
+@dirrm var/trafd
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002090320.WAA27323>