From 13a60063fdda95ae11bb3bccc934ad7d43715158 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 28 Sep 2012 19:30:54 +0000 Subject: [PATCH] use a better MASTER_SITES, as pointed out by Adam Jeanguenat. --- net/daq/Makefile | 27 ++++++++++++--------------- net/snort/Makefile | 20 +++++++++----------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/net/daq/Makefile b/net/daq/Makefile index d85484000a6..17cf3cdf4bb 100644 --- a/net/daq/Makefile +++ b/net/daq/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2012/09/26 01:40:32 lteo Exp $ +# $OpenBSD: Makefile,v 1.2 2012/09/28 19:30:55 sthen Exp $ COMMENT = data acquisition library for snort -# Original URL http://www.snort.org/downloads/1850 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. -DISTNAME = daq-1.1.1 -MASTER_SITES = http://www.snort.org/downloads/1850?/ +DISTNAME = daq-1.1.1 + +SHARED_LIBS += daq 0.0 # 1.0 +SHARED_LIBS += sfbpf 0.0 # 0.1 CATEGORIES = net @@ -16,19 +14,18 @@ HOMEPAGE = http://www.snort.org/ MAINTAINER = Markus Lude # GPLv2 -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes - -SHARED_LIBS += daq 0.0 # 1.0 -SHARED_LIBS += sfbpf 0.0 # 0.1 +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes WANTLIB = pcap +MASTER_SITES = http://www.snort.org/dl/snort-current/ + USE_LIBTOOL = Yes -SEPARATE_BUILD = Yes +SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --enable-ipv6 diff --git a/net/snort/Makefile b/net/snort/Makefile index 9c3c19932ad..34763270246 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,15 +1,10 @@ -# $OpenBSD: Makefile,v 1.68 2012/09/26 02:11:05 lteo Exp $ +# $OpenBSD: Makefile,v 1.69 2012/09/28 19:30:54 sthen Exp $ -SHARED_ONLY = Yes +SHARED_ONLY = Yes COMMENT = highly flexible sniffer/NIDS -# Original URL http://dl.snort.org/downloads/1862 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. -DISTNAME = snort-2.9.3.1 -MASTER_SITES = http://www.snort.org/downloads/1862?/ +DISTNAME = snort-2.9.3.1 CATEGORIES = net security @@ -18,12 +13,15 @@ HOMEPAGE = http://www.snort.org/ MAINTAINER = Markus Lude # GPLv2 -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_FTP = Yes + WANTLIB = c daq dnet m pcap pcre pthread z +MASTER_SITES = http://www.snort.org/dl/snort-current/ + USE_LIBTOOL = Yes USE_GROFF = Yes