o Update to 1.1

o Don't install ${PREFIX}/etc/portsentry.conf ever. Just let
  ${PREFIX}/etc/portsentry.conf.default be the way to go

PR:		30460
Submitted by:	MAINTAINER

security/portsentry/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portsentry
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.psionic.com/tools/
 
@@ -19,9 +19,6 @@ post-patch:
 		${WRKSRC}/portsentry.conf ${WRKSRC}/portsentry_config.h
 
 do-install:
-.if !exists($(PREFIX)/etc/portsentry.conf)
-	${INSTALL_DATA} ${WRKSRC}/portsentry.conf ${PREFIX}/etc
-.endif
 	${INSTALL_DATA} ${WRKSRC}/portsentry.conf ${PREFIX}/etc/portsentry.conf.default
 	${INSTALL_DATA} ${WRKSRC}/portsentry.ignore ${PREFIX}/etc
 	${INSTALL_PROGRAM} ${WRKSRC}/portsentry ${PREFIX}/bin

security/portsentry/distinfo

@@ -1 +1 @@
-MD5 (portsentry-1.0.tar.gz) = d2d29e614f1604bd62a23e33d7a7564f
+MD5 (portsentry-1.1.tar.gz) = 782839446b7eca554bb1880ef0882670

security/portsentry/files/patch-aa

@@ -1,17 +1,16 @@
---- Makefile.orig	Sun May 16 21:55:26 1999
-+++ Makefile	Sun May 16 21:55:46 1999
-@@ -13,12 +13,13 @@
+--- Makefile.orig	Wed Jul 11 16:57:27 2001
++++ Makefile	Wed Sep 12 22:25:13 2001
+@@ -20,13 +20,12 @@
  #
- 
- # Generic compiler
+ #
+ # Generic compiler (usually linked to gcc on most platforms)
 -CC = cc
-+CC ?= cc
+ 
  # GNU..
  #CC = gcc 
  
  # Normal systems flags
 -CFLAGS = -O -Wall
-+CFLAGS ?= -O -Wall
 +CFLAGS += -DPREFIX=\"${PREFIX}\"
  
  # Debug mode for portsentry

security/portsentry/pkg-plist

@@ -1,7 +1,7 @@
 bin/portsentry
 @unexec if cmp -s %D/etc/portsentry.conf %D/etc/portsentry.conf.default; then rm -f %D/etc/portsentry.conf; fi
 etc/portsentry.conf.default
-@exec if [ ! -f %D/etc/portsentry.conf ] ; then cp -p %D/%F %B/portsentry.conf; fi
+@exec if [ ! -f %D/etc/portsentry.conf ] ; then cp -p %B/portsentry.conf %D/etc/portsentry.conf ; fi
 etc/portsentry.ignore
 share/doc/portsentry/README.install
 share/doc/portsentry/README.methods