Remove SNORT_USE_PGSQL option. This will be split out into a separate

package.  For that purpose, move most of Makefile into a new
Makefile.common.

2 files changed, 45 insertions, 44 deletions

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 1368ae1e128..439df1a0b71 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,49 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2002/04/14 09:49:46 rh Exp $
+# $NetBSD: Makefile,v 1.19 2002/04/15 08:31:16 rh Exp $
 #
 
-DISTNAME=	snort-1.8.6
-CATEGORIES=	net security
-MASTER_SITES=	http://www.snort.org/releases/				\
-		ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
-		http://www.centus.com/snort/				\
-		http://snort.whitehats.com/				\
-		http://snort.safenetworks.com/				\
-		ftp://gd.tuwien.ac.at/infosys/security/snort/		\
-		http://snort.sourcefire.com/releases/
-
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.snort.org/
-COMMENT=	Libpcap-based packet sniffer/logger
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-libpcap-includes=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	--with-libpcap-libraries=${BUILDLINK_DIR}/lib
-
-.if defined(SNORT_USE_PGSQL)
-.include	"../../databases/postgresql-lib/buildlink.mk"
-CONFIGURE_ARGS+=	--with-postgresql=${BUILDLINK_DIR}
-.endif
-
-post-install:
-	${INSTALL_DATA_DIR} -m 700 -o ${ROOT_USER} -g ${ROOT_GROUP} /var/log/snort
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snort
-	cd ${WRKSRC} ; \
-	for i in snort.conf *.config *.rules ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/snort ; \
-	done
-	:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
-	cd ${WRKSRC} ; \
-	for f in [A-LN-Z]* ; do \
-		${INSTALL_DATA} $$f ${PREFIX}/share/doc/snort ; \
-	done
-	:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/MIBS
-	cd ${WRKSRC}/MIBS ; \
-	for m in SnortCommonMIB.txt SnortIDAlertMIB.txt ; do \
-		${INSTALL_DATA} $$m ${PREFIX}/share/snort/MIBS ; \
-	done
-	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
+.include "Makefile.common"
 
 .include "../../net/libpcap/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
new file mode 100644
index 00000000000..8abcd67a60a
--- /dev/null
+++ b/net/snort/Makefile.common
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile.common,v 1.1 2002/04/15 08:31:16 rh Exp $
+#
+
+DISTNAME?=	snort-1.8.6
+CATEGORIES?=	net security
+MASTER_SITES?=	http://www.snort.org/releases/				\
+		ftp://the.wiretapped.net/pub/security/network-intrusion-detection/snort/ \
+		http://www.centus.com/snort/				\
+		http://snort.whitehats.com/				\
+		http://snort.safenetworks.com/				\
+		ftp://gd.tuwien.ac.at/infosys/security/snort/		\
+		http://snort.sourcefire.com/releases/
+
+MAINTAINER?=	packages@netbsd.org
+HOMEPAGE?=	http://www.snort.org/
+COMMENT?=	Libpcap-based packet sniffer/logger
+
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--with-libpcap-includes=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=--with-libpcap-libraries=${BUILDLINK_DIR}/lib
+
+post-install:
+	${INSTALL_DATA_DIR} -m 700 -o ${ROOT_USER} -g ${ROOT_GROUP} /var/log/snort
+	${INSTALL_DATA_DIR} ${PREFIX}/share/snort
+	cd ${WRKSRC} ; \
+	for i in snort.conf *.config *.rules ; do \
+		${INSTALL_DATA} $$i ${PREFIX}/share/snort ; \
+	done
+	:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
+	cd ${WRKSRC} ; \
+	for f in [A-LN-Z]* ; do \
+		${INSTALL_DATA} $$f ${PREFIX}/share/doc/snort ; \
+	done
+	:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/MIBS
+	cd ${WRKSRC}/MIBS ; \
+	for m in SnortCommonMIB.txt SnortIDAlertMIB.txt ; do \
+		${INSTALL_DATA} $$m ${PREFIX}/share/snort/MIBS ; \
+	done
+	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
+
+.include "../../net/libpcap/buildlink.mk"