diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/sarg/Makefile | 31 | ||||
| -rw-r--r-- | www/sarg/distinfo | 4 | ||||
| -rw-r--r-- | www/sarg/files/patch-Makefile.in | 51 | ||||
| -rw-r--r-- | www/sarg/pkg-plist | 78 |
4 files changed, 63 insertions, 101 deletions
diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 868470cc1a4f..642c0518dd48 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -6,22 +6,22 @@ # PORTNAME= sarg -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= garga@FreeBSD.org COMMENT= Squid log analyzer and HTML report generator +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + OPTIONS= GD "Enable GD support" on -USE_GCC= 4.2+ USE_ICONV= yes USE_GMAKE= yes -USE_GETTEXT= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes -CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/${PORTNAME}" \ --enable-sargphp="${PREFIX}/etc/${PORTNAME}" \ @@ -30,15 +30,20 @@ CONFIGURE_ARGS= --sysconfdir="${PREFIX}/etc/${PORTNAME}" \ MAN1= sarg.1 -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE - .include <bsd.port.pre.mk> .if ${CC} == "cc" CC= gcc .endif +.if defined(WITHOUT_NLS) +PLIST_SUB+= NLS="@comment " +CONFIGURE_ARGS+= --disable-nls +.else +PLIST_SUB+= NLS="" +USE_GETTEXT= yes +.endif + .if !defined(WITHOUT_GD) LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd .endif @@ -46,9 +51,13 @@ LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd pre-install: ${STRIP_CMD} ${WRKSRC}/sarg -post-install: - @${RM} ${WRKSRC}/languages/.new - @${MKDIR} ${PREFIX}/etc/${PORTNAME}/languages - ${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/etc/${PORTNAME}/languages +post-extract: + @${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \; + @${CHMOD} 0755 ${WRKSRC}/configure + +post-patch: +.if !defined(WITHOUT_NLS) + @${REINPLACE_CMD} -e '/^LIBS/ s/$$/ -lintl/' ${WRKSRC}/Makefile.in +.endif .include <bsd.port.post.mk> diff --git a/www/sarg/distinfo b/www/sarg/distinfo index d2efc0a117df..a1b57771b20f 100644 --- a/www/sarg/distinfo +++ b/www/sarg/distinfo @@ -1,2 +1,2 @@ -SHA256 (sarg-2.3.1.tar.gz) = 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f -SIZE (sarg-2.3.1.tar.gz) = 1073514 +SHA256 (sarg-2.3.2.tar.gz) = b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5 +SIZE (sarg-2.3.2.tar.gz) = 1180411 diff --git a/www/sarg/files/patch-Makefile.in b/www/sarg/files/patch-Makefile.in index b6c12db24719..bead9c38c6c2 100644 --- a/www/sarg/files/patch-Makefile.in +++ b/www/sarg/files/patch-Makefile.in @@ -1,38 +1,17 @@ ---- Makefile.in.orig 2010-08-03 13:41:57.000000000 -0400 -+++ Makefile.in 2011-06-11 22:34:52.000000000 -0400 -@@ -8,7 +8,7 @@ - docdir = @docdir@ - CC = @CC@ - BINDIR = @bindir@ --MANDIR = @mandir@ -+MANDIR = @mandir@/man1 - SYSCONFDIR = @sysconfdir@ - SARGPHPDIR = @SARGPHPDIR@ - FONTDIR = @FONTDIR@ -@@ -23,7 +23,7 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - DEFS = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lintl - SRCDIR = . - VPATH = . - INSTALL = cp -@@ -77,14 +77,13 @@ - mkdir -p $(DESTDIR)$(IMAGEDIR); \ - fi - $(INSTALL_PROGRAM) sarg $(DESTDIR)$(BINDIR)/sarg -- chmod 755 $(DESTDIR)$(BINDIR)/sarg -+ chmod 644 $(DESTDIR)$(BINDIR)/sarg - $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(MANDIR)/sarg.1 -- chmod 755 $(DESTDIR)$(MANDIR)/sarg.1 -+ chmod 644 $(DESTDIR)$(MANDIR)/sarg.1 -+ cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf.default - @if test ! -f $(DESTDIR)$(SYSCONFDIR)/sarg.conf; then \ - echo "cp $(DESTDIR)$(SYSCONFDIR)/sarg.conf"; \ - cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf; \ +--- Makefile.in.orig 2011-06-19 16:12:39.000000000 -0300 ++++ Makefile.in 2011-12-28 10:50:42.000000000 -0200 +@@ -93,12 +93,11 @@ + $(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg + chmod 755 $(DESTDIR)$(bindir)/sarg + $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 +- chmod 755 $(DESTDIR)$(man1dir)/sarg.1 ++ chmod 644 $(DESTDIR)$(man1dir)/sarg.1 ++ cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default + @if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \ + echo "cp $(DESTDIR)$(sysconfdir)/sarg.conf"; \ + cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf; \ - else \ -- cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf.default; \ +- cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default; \ fi - cp ./exclude_codes $(DESTDIR)$(SYSCONFDIR); - cp ./user_limit_block $(DESTDIR)$(SYSCONFDIR); + cp ./exclude_codes $(DESTDIR)$(sysconfdir); + cp ./user_limit_block $(DESTDIR)$(sysconfdir); diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist index fd3cf83b81cb..a698b8a364d4 100644 --- a/www/sarg/pkg-plist +++ b/www/sarg/pkg-plist @@ -1,7 +1,7 @@ bin/sarg @unexec if cmp -s %D/etc/sarg/sarg.conf %D/etc/sarg/sarg.conf.default; then rm -f %D/etc/sarg/sarg.conf; fi -@exec [ ! -f %B/sarg.conf ] || cp -p %B/sarg/sarg.conf.default %B/sarg/sarg.conf etc/sarg/sarg.conf.default +@exec [ ! -f %B/sarg.conf ] || cp -p %B/%f %B/sarg.conf etc/sarg/css.tpl etc/sarg/exclude_codes etc/sarg/fonts/DejaVuSans.ttf @@ -12,33 +12,6 @@ etc/sarg/images/datetime.png etc/sarg/images/graph.png etc/sarg/images/sarg-squidguard-block.png etc/sarg/images/sarg.png -etc/sarg/languages/Afrikaans -etc/sarg/languages/Bulgarian_windows1251 -etc/sarg/languages/Catalan -etc/sarg/languages/Czech -etc/sarg/languages/Czech_UTF8 -etc/sarg/languages/Dutch -etc/sarg/languages/English -etc/sarg/languages/French -etc/sarg/languages/German -etc/sarg/languages/Greek -etc/sarg/languages/Hungarian -etc/sarg/languages/Indonesian -etc/sarg/languages/Italian -etc/sarg/languages/Japanese -etc/sarg/languages/Latvian -etc/sarg/languages/Polish -etc/sarg/languages/Polish_windows1250 -etc/sarg/languages/Portuguese -etc/sarg/languages/Romanian -etc/sarg/languages/Russian_UTF-8 -etc/sarg/languages/Russian_koi8 -etc/sarg/languages/Russian_windows1251 -etc/sarg/languages/Serbian -etc/sarg/languages/Slovak -etc/sarg/languages/Spanish -etc/sarg/languages/Turkish -etc/sarg/languages/Ukrainian_windows1251 etc/sarg/sarg-php/COPYING etc/sarg/sarg-php/INSTALL etc/sarg/sarg-php/LANGUAGES @@ -58,28 +31,30 @@ etc/sarg/sarg-php/sarg-squidguard-block2.php etc/sarg/sarg-php/style.php etc/sarg/sarg-php/translate.this etc/sarg/user_limit_block -share/locale/bg/LC_MESSAGES/sarg.mo -share/locale/ca/LC_MESSAGES/sarg.mo -share/locale/cs/LC_MESSAGES/sarg.mo -share/locale/de/LC_MESSAGES/sarg.mo -share/locale/el/LC_MESSAGES/sarg.mo -share/locale/es/LC_MESSAGES/sarg.mo -share/locale/fr/LC_MESSAGES/sarg.mo -share/locale/hu/LC_MESSAGES/sarg.mo -share/locale/id/LC_MESSAGES/sarg.mo -share/locale/it/LC_MESSAGES/sarg.mo -share/locale/ja/LC_MESSAGES/sarg.mo -share/locale/lv/LC_MESSAGES/sarg.mo -share/locale/nl/LC_MESSAGES/sarg.mo -share/locale/pl/LC_MESSAGES/sarg.mo -share/locale/pt/LC_MESSAGES/sarg.mo -share/locale/ro/LC_MESSAGES/sarg.mo -share/locale/ru/LC_MESSAGES/sarg.mo -share/locale/sk/LC_MESSAGES/sarg.mo -share/locale/sr/LC_MESSAGES/sarg.mo -share/locale/tr/LC_MESSAGES/sarg.mo -share/locale/uk/LC_MESSAGES/sarg.mo -share/locale/zh_CN/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/bg/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/ca/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/cs/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/da/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/de/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/el/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/es/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/fr/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/hu/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/id/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/it/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/ja/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/lv/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/nl/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/pl/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/pt/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/ro/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/ru/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/sk/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/sr/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/tr/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/uk/LC_MESSAGES/sarg.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/sarg.mo @dirrm etc/sarg/sarg-php/locale/ru/LC_MESSAGES @dirrm etc/sarg/sarg-php/locale/ru @dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES @@ -90,7 +65,6 @@ share/locale/zh_CN/LC_MESSAGES/sarg.mo @dirrm etc/sarg/sarg-php/locale/en_EN @dirrm etc/sarg/sarg-php/locale @dirrm etc/sarg/sarg-php -@dirrm etc/sarg/languages @dirrm etc/sarg/images @dirrm etc/sarg/fonts -@dirrm etc/sarg +@dirrmtry etc/sarg |