diff options
Diffstat (limited to 'www/free-sa')
| -rw-r--r-- | www/free-sa/Makefile | 11 | ||||
| -rw-r--r-- | www/free-sa/distinfo | 6 | ||||
| -rw-r--r-- | www/free-sa/files/extra-patch-Makefile | 8 | ||||
| -rw-r--r-- | www/free-sa/files/extra-patch-global-i386.mk | 13 | ||||
| -rw-r--r-- | www/free-sa/files/extra-patch-global-native.mk | 14 | ||||
| -rw-r--r-- | www/free-sa/files/patch-global.mk | 11 |
6 files changed, 42 insertions, 21 deletions
diff --git a/www/free-sa/Makefile b/www/free-sa/Makefile index b9d05b4388ab..8a139f2545aa 100644 --- a/www/free-sa/Makefile +++ b/www/free-sa/Makefile @@ -6,7 +6,7 @@ # PORTNAME= free-sa -PORTVERSION= 1.5.1 +PORTVERSION= 1.6.0 CATEGORIES= www MASTER_SITES= SF @@ -21,11 +21,14 @@ MAN5= free-sa.conf.5 .include <bsd.port.pre.mk> -post-patch: - @${REINPLACE_CMD} -e 's,PREFIX =,PREFIX ?=,' ${WRKSRC}/global.mk - .if defined(NOPORTDOCS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile .endif +.if (${OSVERSION} >= 700000 && ${OSVERSION} <= 800000) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-global-native.mk +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-global-i386.mk +.endif + .include <bsd.port.post.mk> diff --git a/www/free-sa/distinfo b/www/free-sa/distinfo index 716ca4d3d89f..b42c3c233dee 100644 --- a/www/free-sa/distinfo +++ b/www/free-sa/distinfo @@ -1,3 +1,3 @@ -MD5 (free-sa-1.5.1.tar.gz) = b92c990932f9feae8f4f73e8ffef69fa -SHA256 (free-sa-1.5.1.tar.gz) = 4d3fd13ee288c892e335833376a563a0ad2ba3ac240af00bb177a27311ad0d07 -SIZE (free-sa-1.5.1.tar.gz) = 81984 +MD5 (free-sa-1.6.0.tar.gz) = e013ef81f53a034528cda62772ab0a21 +SHA256 (free-sa-1.6.0.tar.gz) = b1f8a43073ada7cfe873d1e8dfe2752722d2854df63b62df10c5f2fbf8b68213 +SIZE (free-sa-1.6.0.tar.gz) = 83646 diff --git a/www/free-sa/files/extra-patch-Makefile b/www/free-sa/files/extra-patch-Makefile index e08193c44341..92ad3977479e 100644 --- a/www/free-sa/files/extra-patch-Makefile +++ b/www/free-sa/files/extra-patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orgi 2008-12-07 14:02:42.000000000 +0100 -+++ Makefile 2008-12-07 14:03:19.000000000 +0100 -@@ -15,8 +15,4 @@ +--- Makefile.orig 2009-04-04 14:30:13.000000000 +0400 ++++ Makefile 2009-04-04 14:30:39.000000000 +0400 +@@ -17,10 +17,6 @@ $(MAKEDIRS) @( \ $(INSTALLODR) $(TMPDIR); \ @@ -9,3 +9,5 @@ - $(INSTALLFIL) $$IDOCFILE $(DOCDIR); \ - done \ ) + + src/config.h: diff --git a/www/free-sa/files/extra-patch-global-i386.mk b/www/free-sa/files/extra-patch-global-i386.mk new file mode 100644 index 000000000000..f964ea8fde03 --- /dev/null +++ b/www/free-sa/files/extra-patch-global-i386.mk @@ -0,0 +1,13 @@ +--- global.mk.orig 2009-04-04 14:04:07.000000000 +0400 ++++ global.mk 2009-04-04 14:04:45.000000000 +0400 +@@ -1,8 +1,8 @@ + # Operating system profile +-OSTYPE = generic-any-cc ++#OSTYPE = generic-any-cc + #OSTYPE = altlinux-i586-gcc4 + #OSTYPE = cygwin-native-gcc3 +-#OSTYPE = freebsd-i386-gcc3 ++OSTYPE = freebsd-i386-gcc3 + #OSTYPE = freebsd-native-gcc4 + #OSTYPE = hpux-64_2.0W-cc + #OSTYPE = openbsd-i386-gcc3 diff --git a/www/free-sa/files/extra-patch-global-native.mk b/www/free-sa/files/extra-patch-global-native.mk new file mode 100644 index 000000000000..9f04346156f7 --- /dev/null +++ b/www/free-sa/files/extra-patch-global-native.mk @@ -0,0 +1,14 @@ +--- global.mk.orig 2009-03-23 01:39:59.000000000 +0300 ++++ global.mk 2009-04-04 14:24:39.000000000 +0400 +@@ -1,9 +1,9 @@ + # Operating system profile +-OSTYPE = generic-any-cc ++#OSTYPE = generic-any-cc + #OSTYPE = altlinux-i586-gcc4 + #OSTYPE = cygwin-native-gcc3 + #OSTYPE = freebsd-i386-gcc3 +-#OSTYPE = freebsd-native-gcc4 ++OSTYPE = freebsd-native-gcc4 + #OSTYPE = hpux-64_2.0W-cc + #OSTYPE = openbsd-i386-gcc3 + #OSTYPE = redhat-native-gcc4 diff --git a/www/free-sa/files/patch-global.mk b/www/free-sa/files/patch-global.mk deleted file mode 100644 index 669304ecaddc..000000000000 --- a/www/free-sa/files/patch-global.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- global.mk.orig Wed Apr 4 15:43:18 2007 -+++ global.mk Wed Apr 4 15:43:35 2007 -@@ -10,7 +10,7 @@ - # etc dir - ETCDIR = $(PREFIX)/etc/$(PROGLNAME) - # where put reports (you can change it later via free-sa.conf configuration file) --WWWDIR = $(PREFIX)/var/www/htdocs/$(PROGLNAME) -+WWWDIR = $(PREFIX)/www/data/$(PROGLNAME) - # dir for temporary data storing (you can change it later via free-sa.conf configuration file) - TMPDIR = /var/cache/$(PROGLNAME) - # where log file lives (you can change it later via free-sa.conf configuration file) |