On 2012/09/24 12:42, Adam Jeanguenat wrote: > To make life easier, Sourcefire provides a URL that works without > respect to the automatically-incremented ID number for every file upload > to snort.org:
Ah good, they didn't used to have that. Diff against the committed version, compared to yours it moves MASTER_SITES to the normal place now it doesn't need to be updated per-release, moves SHARED_LIBS to the normal place for daq, and doesn't use an unnecessary VERSION variable. OK with you Markus? Index: snort/Makefile =================================================================== RCS file: /cvs/ports/net/snort/Makefile,v retrieving revision 1.68 diff -u -p -w -r1.68 Makefile --- snort/Makefile 26 Sep 2012 02:11:05 -0000 1.68 +++ snort/Makefile 26 Sep 2012 08:22:45 -0000 @@ -4,12 +4,7 @@ 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?/ CATEGORIES = net security @@ -22,7 +17,10 @@ PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = 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 Index: daq/Makefile =================================================================== RCS file: /cvs/ports/net/daq/Makefile,v retrieving revision 1.1.1.1 diff -u -p -w -r1.1.1.1 Makefile --- daq/Makefile 26 Sep 2012 01:40:32 -0000 1.1.1.1 +++ daq/Makefile 26 Sep 2012 08:22:45 -0000 @@ -2,12 +2,10 @@ 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?/ + +SHARED_LIBS += daq 0.0 # 1.0 +SHARED_LIBS += sfbpf 0.0 # 0.1 CATEGORIES = net @@ -21,11 +19,10 @@ 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 - WANTLIB = pcap +MASTER_SITES = http://www.snort.org/dl/snort-current/ + USE_LIBTOOL = Yes SEPARATE_BUILD = Yes
