Index: head/security/vpnc/Makefile
===================================================================
--- head/security/vpnc/Makefile	(revision 208216)
+++ head/security/vpnc/Makefile	(revision 208217)
@@ -1,76 +1,76 @@
 # New ports collection makefile for:	vpnc
 # Date created:				15 December 2003
 # Whom:					Christian Lackas
 #
 # $FreeBSD$
 #
 
 PORTNAME=	vpnc
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 		http://critical.ch/distfiles/ \
 		http://energy.critical.ch/distfiles/
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
 LIB_DEPENDS=	gcrypt.15:${PORTSDIR}/security/libgcrypt
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	vpnc
 
 ALL_TARGET=	all
 
 PORTDOCS=	README TODO
 MAN8=		vpnc.8
 
 OPTIONS+=	DECRYPT "cisco-decypt password decrypt utility"     on
 OPTIONS+=	SSL     "OpenSSL certificate support (hybrid only)" off
 
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" CC="${CC}" \
 		BINS="${EXTRABUILDS}"
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DECRYPT)
 MAN1=		cisco-decrypt.1
 EXTRABUILDS+=	cisco-decrypt
 PLIST_SUB+=	DECRYPT=""
 .else
 PLIST_SUB+=	DECRYPT="@comment "
 .endif
 
 .if defined(WITH_SSL)
 NO_PACKAGE=	binary linked against OpenSSL must not be redistributed
 CFLAGS+=	-DOPENSSL_GPL_VIOLATION
 LDFLAGS+=	-lcrypto
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c
 	@${REINPLACE_CMD} -e 's|\(/etc/vpnc\)|${PREFIX}\1|' \
 		${WRKSRC}/${MAN8}.template
 
 do-install:
 	${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc
 .if defined(WITH_DECRYPT)
 	${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
 .endif
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/vpnc-script ${PREFIX}/sbin/vpnc-script
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/vpnc-disconnect ${PREFIX}/sbin/vpnc-disconnect
 	${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${PREFIX}/etc/vpnc.conf.sample
 .if !exists(${PREFIX}/etc/vpnc.conf)
 	${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${PREFIX}/etc
 .endif
 	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/security/vpnc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/security/vpnc/files/patch-Makefile
===================================================================
--- head/security/vpnc/files/patch-Makefile	(revision 208216)
+++ head/security/vpnc/files/patch-Makefile	(revision 208217)
@@ -1,33 +1,42 @@
 --- Makefile.orig	2007-09-06 22:05:15.000000000 +0200
-+++ Makefile	2008-02-27 19:17:28.000000000 +0100
++++ Makefile	2008-02-29 21:58:37.000000000 +0100
 @@ -20,14 +20,14 @@
  # $Id: Makefile 236 2007-09-05 20:40:59Z Joerg Mayer $
  
  DESTDIR=
 -PREFIX=/usr/local
 -ETCDIR=/etc/vpnc
 +PREFIX?=/usr/local
 +ETCDIR=$(PREFIX)/etc/
  BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
  MANDIR=$(PREFIX)/share/man
  
  SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c
 -BINS = vpnc cisco-decrypt
 +BINS += vpnc
  OBJS = $(addsuffix .o,$(basename $(SRCS)))
  BINOBJS = $(addsuffix .o,$(BINS))
  BINSRCS = $(addsuffix .c,$(BINS))
 @@ -49,9 +49,9 @@
  #OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
  #OPENSSLLIBS = -lcrypto
  
 -CC=gcc
 -CFLAGS ?= -O3 -g
 -CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
 +CC?=gcc
 +#CFLAGS ?= -O3 -g
 +#CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
  CFLAGS +=  $(shell libgcrypt-config --cflags)
  CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
  LDFLAGS ?= -g
+@@ -74,7 +74,7 @@
+ 	./makeman.pl
+ 
+ cisco-decrypt : cisco-decrypt.o config.o supp.o sysdep.o vpnc-debug.o
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ .depend: $(SRCS) $(BINSRCS)
+ 	$(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@

Property changes on: head/security/vpnc/files/patch-Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/security/vpnc/files/patch-config.c
===================================================================
--- head/security/vpnc/files/patch-config.c	(revision 208216)
+++ head/security/vpnc/files/patch-config.c	(revision 208217)
@@ -1,36 +1,37 @@
 --- config.c.orig	2007-09-10 22:39:48.000000000 +0200
 +++ config.c	2008-02-26 11:33:02.000000000 +0100
 @@ -267,12 +267,12 @@
  
  static const char *config_def_script(void)
  {
 -	return "/etc/vpnc/vpnc-script";
 +	return "%%PREFIX%%/sbin/vpnc-script";
  }
  
  static const char *config_def_pid_file(void)
  {
 -	return "/var/run/vpnc/pid";
 +	return "/var/run/vpnc.pid";
  }
  
  static const char *config_def_vendor(void)
 @@ -538,7 +538,7 @@
  {
  	char *realname;
  	
 -	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
-+	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/", name, add_dot_conf ? ".conf" : "");
++	asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "%%PREFIX%%/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
  	return realname;
  }
  
-@@ -757,8 +757,7 @@
+@@ -757,8 +757,8 @@
  	}
  	
  	if (!got_conffile) {
 -		read_config_file("/etc/vpnc/default.conf", config, 1);
 -		read_config_file("/etc/vpnc.conf", config, 1);
++		read_config_file("%%PREFIX%%/etc/vpnc/default.conf", config, 1);
 +		read_config_file("%%PREFIX%%/etc/vpnc.conf", config, 1);
  	}
  	
  	if (!print_config) {

Property changes on: head/security/vpnc/files/patch-config.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property