upgrade to 1.6.1b

PR:		45937
Submitted by:	Ports Fury

6 files changed, 11 insertions, 42 deletions

diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index 3c34677e6045..d9101f8a52ed 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	sentinel
-PORTVERSION=	1.2b
+PORTVERSION=	1.6.1b
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	smfilter
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-MAKEFILE=	Makefile.FreeBSD
-ALL_TARGET=	sentinel
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e \
+		's|:/var|:${PREFIX}/var|g' ${WRKSRC}/sentinel.cf.SAMPLE
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} -o ${PORTNAME} \
+		${PORTNAME}.c -lmilter ${PTHREAD_LIBS} 
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${PREFIX}/sbin
@@ -27,9 +29,6 @@ do-install:
 	${CHOWN} smmsp:smmsp ${PREFIX}/var/sentinel
 	${INSTALL_SCRIPT} ${FILESDIR}/000.sentinel.sh ${PREFIX}/etc/rc.d
 	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${PREFIX}/etc/sentinel.cf.dist
-
-post-install:
-	@${STRIP_CMD} ${PREFIX}/sbin/sentinel
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/mail/sentinel/distinfo b/mail/sentinel/distinfo
index 78eaa8f8b7fe..1de426bbcb7e 100644
--- a/mail/sentinel/distinfo
+++ b/mail/sentinel/distinfo
@@ -1 +1 @@
-MD5 (sentinel-1.2b.tar.gz) = ff166f7903569b5c5729e034e0ae8825
+MD5 (sentinel-1.6.1b.tar.gz) = 11adcb2b0b2e39cc2c6b0e894107c57c
diff --git a/mail/sentinel/files/patch-Makefile.FreeBSD b/mail/sentinel/files/patch-Makefile.FreeBSD
deleted file mode 100644
index 9f41accfe959..000000000000
--- a/mail/sentinel/files/patch-Makefile.FreeBSD
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.FreeBSD.orig	Wed May  8 11:09:48 2002
-+++ Makefile.FreeBSD	Tue Oct 22 20:20:20 2002
-@@ -1,13 +1,13 @@
--CC = gcc
-+CC ?= cc
- 
--CFLAGS = -O -I../../include
-+CFLAGS += -I../../include
- 
--LDFLAGS =  -L../libmilter -L../libsmutil -L../libsm -pthread
-+LDFLAGS =  -L../libmilter -lc_r
- 
--LIBS = -lmilter -lsmutil -lsm
-+LIBS = -lmilter
- 
- OBJS = sentinel.o
- 
--sentinel:       $(OBJS)
--                $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-+sentinel: $(OBJS)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
diff --git a/mail/sentinel/files/patch-sentinel.cf.SAMPLE b/mail/sentinel/files/patch-sentinel.cf.SAMPLE
deleted file mode 100644
index cb97f1f89d90..000000000000
--- a/mail/sentinel/files/patch-sentinel.cf.SAMPLE
+++ /dev/null
@@ -1,10 +0,0 @@
---- sentinel.cf.SAMPLE.orig	Tue May 14 17:18:45 2002
-+++ sentinel.cf.SAMPLE	Tue May 14 17:19:20 2002
-@@ -1,6 +1,6 @@
- [global]
- tmp:/var/tmp
--log:/var/log/smfilter.log
-+log:/usr/local/var/sentinel/smfilter.log
- user:smmsp
- group:smmsp
- 
diff --git a/mail/sentinel/pkg-descr b/mail/sentinel/pkg-descr
index f1cc7a30334f..037352afec47 100644
--- a/mail/sentinel/pkg-descr
+++ b/mail/sentinel/pkg-descr
@@ -3,3 +3,5 @@ be usefull for unix system administrators who is using freeware
 Sendmail. May be it's one more milter, but on the other side it's 
 flexible enough to satisfy more or less subtle requirements for mail 
 filtering.
+
+WWW: http://smfilter.sourceforge.net/
diff --git a/mail/sentinel/pkg-plist b/mail/sentinel/pkg-plist
index 82d1916670c0..3e758ffa50a1 100644
--- a/mail/sentinel/pkg-plist
+++ b/mail/sentinel/pkg-plist
@@ -3,6 +3,6 @@ etc/sentinel.cf.dist
 etc/rc.d/000.sentinel.sh
 @exec mkdir %D/var/sentinel
 @exec chown smmsp.smmsp %D/var/sentinel
-@dirrm var/sentinel
+@unexec rmdir %D/var/sentinel 2>/dev/null || true
 %%PORTDOCS%%share/doc/sentinel/README
 %%PORTDOCS%%@dirrm share/doc/sentinel