Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/circe/Makefile,v
--- Makefile	20 Jul 2011 08:34:15 -0000	1.4
+++ Makefile	30 Jul 2011 00:48:38 -0000
@@ -6,32 +6,46 @@ 
 #
 
 PORTNAME=	circe
-PORTVERSION=	0.2.2
+PORTVERSION=	0.2.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://bws.berkeley.edu/ports/
 
-MAINTAINER=	circe-port-maintainers@bws.berkeley.edu
+MAINTAINER=	circe-port-maintainers@bws.net.berkeley.edu
 COMMENT=	A captive portal-based network access control solution in perl
 
+USE_PERL5=	 yes
+
 DIST_SUBDIR=	${PORTNAME}
 
-BUILD_DEPENDS=	${SITE_PERL}/mach/Net/IP/Match/XS.pm:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
+LICENSE=	BSD
+
+RUN_DEPENDS=	${SITE_PERL}/mach/Net/IP/Match/XS.pm:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
 		${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		${SITE_PERL}/mach/IO.pm:${PORTSDIR}/devel/p5-IO \
+		${SITE_PERL}/${PERL_ARCH}/IO.pm:${PORTSDIR}/devel/p5-IO \
 		${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
-		${SITE_PERL}/mach/Sys/Syslog.pm:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		${SITE_PERL}/mach/TryCatch.pm:${PORTSDIR}/lang/p5-TryCatch \
+		${SITE_PERL}/${PERL_ARCH}/Sys/Syslog.pm:${PORTSDIR}/sysutils/p5-Sys-Syslog \
+		${SITE_PERL}/${PERL_ARCH}/TryCatch.pm:${PORTSDIR}/lang/p5-TryCatch \
 		${SITE_PERL}/Data/Validate/IP.pm:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP \
 		${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${SITE_PERL}/mach/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
+		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
 		${SITE_PERL}/Crypt/CBC.pm:${PORTSDIR}/security/p5-Crypt-CBC \
 		${SITE_PERL}/Proc/PID/File.pm:${PORTSDIR}/devel/p5-Proc-PID-File
 
+OPTIONS=	ENCRYPT "Encrypt the destination URL in redirection" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_ENCRYPT)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
+				${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/AES.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES
+.endif
+
 MANCOMPRESSED=	no
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(SITE_PERL)|${SITE_PERL}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|$$(SITE_PERL)|${PREFIX}/${SITE_PERL_REL}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|$$(SITE_PERL_REL)|${SITE_PERL_REL}|g' ${WRKSRC}/Makefile
 
 WRKSRC=	${WRKDIR}
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/circe/distinfo,v
--- distinfo	20 Jul 2011 08:34:15 -0000	1.4
+++ distinfo	30 Jul 2011 00:48:38 -0000
@@ -1,2 +1,2 @@ 
-SHA256 (circe/circe-0.2.2.tar.gz) = 336abc65224ac46059e45bc4a78f9c0aca8d159c5ec18f816dad52805f72b714
-SIZE (circe/circe-0.2.2.tar.gz) = 29984
+SHA256 (circe/circe-0.2.3.tar.gz) = f3af826ba2f83544535ff6eaa8a419dbedea19d53c6cbc6d67618fbfb27fa9c8
+SIZE (circe/circe-0.2.3.tar.gz) = 31545
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/circe/pkg-plist,v
--- pkg-plist	20 Jul 2011 08:34:15 -0000	1.3
+++ pkg-plist	30 Jul 2011 00:48:38 -0000
@@ -18,6 +18,7 @@ 
 etc/ipfw.init.dist
 etc/ipfw.local.dist
 etc/rc.d/circed
+%%SITE_PERL%%/LibNAC.pm
 @unexec rmdir %D/etc/env 2>/dev/null || true
 @unexec rmdir %D/share/nac 2>/dev/null || true
 @unexec rmdir %D/libexec/nac 2>/dev/null || true