Index: barnyard2/Makefile
===================================================================
--- barnyard2/Makefile	(revision 305171)
+++ barnyard2/Makefile	(working copy)
@@ -1,38 +1,37 @@
-# New ports collection makefile for:	barnyard2
-# Date created:				28 Aug 2009
-# Whom:					pauls
-#
+# Created by: Paul Schmehl <pauls@utdallas.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	barnyard2
-PORTVERSION=	1.9
-PORTREVISION=	2
+PORTVERSION=	1.10
 CATEGORIES=	security
-MASTER_SITES=	http://www.securixlive.com/download/barnyard2/
+MASTER_SITES=	https://github.com/firnsy/${PORTNAME}/tarball/v2-${PORTVERSION}/
+DISTNAME=	firnsy-${PORTNAME}-v2-${PORTVERSION}-0-g${GITVERSION}
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	An output system for Snort or Suricata that parses unified2 files
 
-OPTIONS=	MYSQL "Enable MySQL support" on \
-		POSTGRESQL "Enable PostgreSQL support" off \
-		SNORT "Depend on security/snort" off \
-		SURICATA "Depend on security/suricata" off
-.if !defined(SLAVE)
-OPTIONS+=	TCL "Enable TCL support" off
-.endif
+GITVERSION=     2f5d496
+FETCH_ARGS=      -pRr
+WRKSRC=		${WRKDIR}/firnsy-${PORTNAME}-${GITVERSION}
 
 USE_RC_SUBR=	barnyard2
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf automake libtoolize
 SUB_FILES=	pkg-message
 
 PORTDOCS1=	README
 PORTDOCS2=	INSTALL README.aruba README.database README.sguil
 PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=		MYSQL PGSQL SNORT SURICATA TCL
+OPTIONS_DEFAULT=	MYSQL
 
-.if defined(WITH_MYSQL)
+SNORT_DESC=		Depend on security/snort
+SURICATA_DESC=		Depend on security/suricata
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
@@ -42,7 +41,7 @@
 SUB_LIST+=		MYSQL=""
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql
 SUB_LIST+=		PGSQL=" postgresql"
@@ -50,20 +49,30 @@
 SUB_LIST+=		PGSQL=""
 .endif
 
-.if defined(WITH_SNORT)
+.if ${PORT_OPTIONS:MSNORT}
 RUN_DEPENDS+=		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 .endif
 
-.if defined(WITH_SURICATA)
+.if ${PORT_OPTIONS:MSURICATA}
 RUN_DEPENDS+=		${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
 .endif
 
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
 USE_TCL=		yes
 CONFIGURE_ARGS+=	--with-tcl=${PREFIX}/lib/tcl8.4
-LIB_DEPENDS+=		tcl84.1:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS+=		tcl84:${PORTSDIR}/lang/tcl84
 .endif
 
+.include <bsd.port.pre.mk>
+
+run-autotools:	run-autotools-autoreconf
+
+run-autotools-autoreconf:
+	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -fiv
+
+post-extract:
+	@${MV} ${CONFIGURE_WRKSRC}/configure.in ${CONFIGURE_WRKSRC}/configure.ac
+
 pre-install:
 	${CHMOD} 744 ${WRKSRC}/install-sh
 
@@ -72,12 +81,11 @@
 		${WRKSRC}/etc/barnyard2.conf
 
 post-install:
-
 .for f in barnyard2.conf
 	[ -f ${PREFIX}/etc/${f} ] || \
 	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
Index: barnyard2/distinfo
===================================================================
--- barnyard2/distinfo	(revision 305171)
+++ barnyard2/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (barnyard2-1.9.tar.gz) = 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50b33bc1125125c8a9e78a5b0c
-SIZE (barnyard2-1.9.tar.gz) = 652879
+SHA256 (firnsy-barnyard2-v2-1.10-0-g2f5d496.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2
+SIZE (firnsy-barnyard2-v2-1.10-0-g2f5d496.tar.gz) = 419781
Index: barnyard2-sguil/Makefile
===================================================================
--- barnyard2-sguil/Makefile	(revision 305171)
+++ barnyard2-sguil/Makefile	(working copy)
@@ -1,12 +1,13 @@
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-sguil
 
 MASTERDIR=	${.CURDIR}/../barnyard2
 
 # enable tcl binding for sguil
-WITH_TCL=	yes
+PORT_OPTIONS+=	TCL
 SLAVE=		yes
 
+UNIQUENAME=	barnyard2-sguil
+
 .include "${MASTERDIR}/Makefile"