From ac0beeb5f695dd0f38e686e77bf2457ffa10fd26 Mon Sep 17 00:00:00 2001
From: vs <vs@FreeBSD.org>
Date: Tue, 26 Apr 2005 08:34:13 +0000
Subject: - Update to 1.15 - Use PLIST_FILES, SUB_FILES

---
 mail/vbsfilter/Makefile                |  9 +++++----
 mail/vbsfilter/distinfo                |  4 ++--
 mail/vbsfilter/files/patch-vbsfilter.c |  9 ++++-----
 mail/vbsfilter/files/vbsfilter.sh      | 23 -----------------------
 mail/vbsfilter/files/vbsfilter.sh.in   | 23 +++++++++++++++++++++++
 mail/vbsfilter/pkg-plist               |  3 ---
 6 files changed, 34 insertions(+), 37 deletions(-)
 delete mode 100644 mail/vbsfilter/files/vbsfilter.sh
 create mode 100644 mail/vbsfilter/files/vbsfilter.sh.in
 delete mode 100644 mail/vbsfilter/pkg-plist

(limited to 'mail')

diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index a068a3b4b660..b07c55a87755 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vbsfilter
-PORTVERSION=	1.11
+PORTVERSION=	1.15
 CATEGORIES=	mail
 MASTER_SITES=	http://aeschi.ch.eu.org/milter/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -16,6 +16,9 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A vbs-attachment filter for Sendmail
 
+SUB_FILES=	vbsfilter.sh
+PLIST_FILES=	libexec/vbsfilter etc/rc.d/vbsfilter.sh.sample
+
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 .if defined(SENDMAIL_WITH_SHARED_MILTER)
 LIB_DEPENDS+=	milter.3:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}
@@ -57,8 +60,6 @@ pre-fetch:
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${_DISTDIR}vbsfilter-${PORTVERSION}.c ${WRKSRC}
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/vbsfilter.sh \
-		> ${WRKSRC}/vbsfilter.sh
 
 .for i in ${CTARGETS}
 ${i}:
@@ -72,7 +73,7 @@ do-build:	${CTARGETS}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-${PORTVERSION} \
 		${PREFIX}/libexec/vbsfilter
-	${INSTALL_SCRIPT} ${WRKSRC}/vbsfilter.sh \
+	${INSTALL_SCRIPT} ${WRKDIR}/vbsfilter.sh \
 		${PREFIX}/etc/rc.d/vbsfilter.sh.sample
 
 .include <bsd.port.post.mk>
diff --git a/mail/vbsfilter/distinfo b/mail/vbsfilter/distinfo
index d881845245e2..06e8ac36779c 100644
--- a/mail/vbsfilter/distinfo
+++ b/mail/vbsfilter/distinfo
@@ -1,2 +1,2 @@
-MD5 (vbsfilter-1.11.c) = 929924ede533cb8cb20afd05f46fbd2b
-SIZE (vbsfilter-1.11.c) = 10639
+MD5 (vbsfilter-1.15.c) = 09d2bb03d8c1c4136c2876fa8b4c2245
+SIZE (vbsfilter-1.15.c) = 11776
diff --git a/mail/vbsfilter/files/patch-vbsfilter.c b/mail/vbsfilter/files/patch-vbsfilter.c
index 3cefb3e3847e..e7315cda8b7b 100644
--- a/mail/vbsfilter/files/patch-vbsfilter.c
+++ b/mail/vbsfilter/files/patch-vbsfilter.c
@@ -1,11 +1,10 @@
---- vbsfilter-1.11.c.orig	Thu Jan 16 04:21:30 2003
-+++ vbsfilter-1.11.c	Thu Jan 16 04:27:36 2003
-@@ -13,6 +13,12 @@
+--- vbsfilter-1.15.c.orig
++++ vbsfilter-1.15.c
+@@ -14,6 +14,11 @@
+ #include <sysexits.h>
  #include <termios.h>
  #include <unistd.h>
- #include <sys/ioctl.h>
 +#ifdef __FreeBSD__
-+#include <ctype.h>
 +#include <stdlib.h>
 +#include <netdb.h>
 +#include <unistd.h>
diff --git a/mail/vbsfilter/files/vbsfilter.sh b/mail/vbsfilter/files/vbsfilter.sh
deleted file mode 100644
index 2a9d10134919..000000000000
--- a/mail/vbsfilter/files/vbsfilter.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/vbsfilter/files/Attic/vbsfilter.sh,v 1.4 2003-12-04 03:24:09 dinoex Exp $
-# 
-if ! test -x %%PREFIX%%/libexec/vbsfilter
-then
-	exit 0
-fi
-case "$1" in
-start)
-	rm -f /var/run/vbsfilter
-	%%PREFIX%%/libexec/vbsfilter -p local:/var/run/vbsfilter &&
-	echo -n ' vbsfilter'
-	;;
-stop)
-	killall vbsfilter
-	rm -f /var/run/vbsfilter
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop }" >&2
-	exit 64
-	;;
-esac
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in
new file mode 100644
index 000000000000..58423464eb09
--- /dev/null
+++ b/mail/vbsfilter/files/vbsfilter.sh.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+# 
+if ! test -x %%PREFIX%%/libexec/vbsfilter
+then
+	exit 0
+fi
+case "$1" in
+start)
+	rm -f /var/run/vbsfilter
+	%%PREFIX%%/libexec/vbsfilter -p local:/var/run/vbsfilter &&
+	echo -n ' vbsfilter'
+	;;
+stop)
+	killall vbsfilter
+	rm -f /var/run/vbsfilter
+	;;
+*)
+	echo "Usage: ${0##*/}: { start | stop }" >&2
+	exit 64
+	;;
+esac
diff --git a/mail/vbsfilter/pkg-plist b/mail/vbsfilter/pkg-plist
deleted file mode 100644
index d1872a395cd7..000000000000
--- a/mail/vbsfilter/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/vbsfilter/Attic/pkg-plist,v 1.1 2001-03-13 06:47:25 dinoex Exp $
-libexec/vbsfilter
-etc/rc.d/vbsfilter.sh.sample
-- 
cgit