Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 22 May 2014 08:40:12 +0200 (CEST)
From:      Udo Schweigert <udo.schweigert@siemens.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/190095: maintainer update of net/iplog
Message-ID:  <201405220640.s4M6eC6l016994@alaska.cert.siemens.de>
Resent-Message-ID: <201405220650.s4M6o06L024962@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         190095
>Category:       ports
>Synopsis:       maintainer update of net/iplog
>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:   Thu May 22 06:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 9.2-STABLE amd64
>Organization:
>Environment:
>Description:

Maintainer update of net/iplog:

	- Implement staging

Committer: new file to added to repo: pkg-install

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/net/iplog/Makefile ./Makefile
--- /usr/ports/net/iplog/Makefile	2014-04-05 10:23:06.000000000 +0200
+++ ./Makefile	2014-05-12 08:22:21.000000000 +0200
@@ -14,13 +14,9 @@
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-MAN5=		iplog.conf.5
-MAN8=		iplog.8
 
 USE_RC_SUBR=	iplog
-SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 post-patch:
 .for FILE in example-iplog.conf iplog.8 iplog.conf.5 src/iplog.h
@@ -29,19 +25,6 @@
 	@${REINPLACE_CMD} -e 's|-pthread||g' ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc
-.if !exists(${PREFIX}/etc/iplog.conf)
-	${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc/iplog.conf
-.endif
-.if exists(${PREFIX}/etc/iplog.rules)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "============================================================================"
-	@${ECHO_MSG} "Hint:	iplog changed its configuration file from ${PREFIX}/etc/iplog.rules"
-	@${ECHO_MSG} "	to ${PREFIX}/etc/iplog.conf"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "See ${PREFIX}/etc/example-iplog.conf for an example"
-	@${ECHO_MSG} "============================================================================"
-.endif
-	@${MKDIR} /var/run/iplog
+	@${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.post.mk>
diff -ru  /usr/ports/net/iplog/pkg-deinstall ./pkg-deinstall
--- /usr/ports/net/iplog/pkg-deinstall	2014-04-05 10:23:06.000000000 +0200
+++ ./pkg-deinstall	2014-05-11 12:54:06.000000000 +0200
@@ -1,2 +1,18 @@
 #!/bin/sh
-rm -rf /var/run/iplog
+#
+#	$FreeBSD: $
+#
+
+#set -vx
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+case $2 in
+	DEINSTALL)
+		:
+		;;
+	POST-DEINSTALL)
+		/bin/rm -rf /var/run/iplog
+		;;
+
+esac
diff -ru  /usr/ports/net/iplog/pkg-install ./pkg-install
--- /usr/ports/net/iplog/pkg-install	1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-install	2014-05-11 13:15:08.000000000 +0200
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+#	$FreeBSD: $
+#
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+case $2 in
+	PRE-INSTALL)
+		:
+	;;
+	POST-INSTALL)
+		if [ ! -e ${PKG_PREFIX}/etc/iplog.conf ]; then
+			/bin/cp -p ${PKG_PREFIX}/example-iplog.conf ${PKG_PREFIX}/etc/iplog.conf
+		fi
+		if [ -e ${PKG_PREFIX}/etc/iplog.rules ]; then
+			echo
+			echo "============================================================================"
+			echo "Hint:	iplog changed its configuration file from ${PKG_PREFIX}/etc/iplog.rules"
+			echo "	to ${PKG_PREFIX}/etc/iplog.conf"
+			echo
+			echo "See ${PKG_PREFIX}/etc/example-iplog.conf for an example"
+			echo "============================================================================"
+		fi
+		/bin/mkdir /var/run/iplog
+        ;;
+esac
diff -ru  /usr/ports/net/iplog/pkg-plist ./pkg-plist
--- /usr/ports/net/iplog/pkg-plist	2014-04-05 10:23:06.000000000 +0200
+++ ./pkg-plist	2014-05-11 13:17:50.000000000 +0200
@@ -2,3 +2,5 @@
 @unexec if cmp -s %D/etc/iplog.conf %D/etc/example-iplog.conf; then rm -f %D/etc/iplog.conf; fi
 etc/example-iplog.conf
 @exec test -f %B/iplog.conf || cp %B/%f %B/iplog.conf
+man/man5/iplog.conf.5.gz
+man/man8/iplog.8.gz
>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405220640.s4M6eC6l016994>