diff options
| -rw-r--r-- | www/webalizer/Makefile | 39 | ||||
| -rw-r--r-- | www/webalizer/PLIST | 4 | ||||
| -rw-r--r-- | www/webalizer/distinfo | 8 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-ab | 13 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-ac | 15 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-ad | 14 | ||||
| -rw-r--r-- | www/webalizer/patches/patch-ae | 13 |
7 files changed, 55 insertions, 51 deletions
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index 507ec46639a..1dc2b01abca 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/12/01 02:26:24 briggs Exp $ +# $NetBSD: Makefile,v 1.16 2001/12/01 15:08:02 jlam Exp $ # DISTNAME= webalizer-2.01-06-src @@ -9,26 +9,35 @@ MASTER_SITES= ftp://ftp.mrunix.net/webalizer/ \ http://gd.tuwien.ac.at/infosys/logeval/webalizer/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= mjl@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mrunix.net/webalizer/ COMMENT= Web server log file analysis program -DEPENDS+= gd-1.*:../../graphics/gd -DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -WRKSRC= ${WRKDIR}/webalizer-2.01-06 +USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-dns +CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_DIR}/include -USE_X11= yes -USE_XPM= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gd=${LOCALBASE}/include --with-gdlib=${LOCALBASE}/lib \ - --enable-dns +EGDIR= ${PREFIX}/share/examples +CONF_FILES= ${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf -post-patch: - @for f in webalizer.1; do \ - ${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKSRC}/$$f \ - >${WRKSRC}/$$f.new && \ - ${MV} ${WRKSRC}/$$f.new ${WRKSRC}/$$f; \ +post-build: + cd ${WRKSRC}; for file in sample.conf webalizer.1; do \ + ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ + $${file} > $${file}.fixed; \ + ${MV} -f ${WRKSRC}/$${file}.fixed ${WRKSRC}/$${file}; \ done +pre-install: + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL + +post-install: + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL + +.include "../../graphics/gd/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/webalizer/PLIST b/www/webalizer/PLIST index ac75ccb6632..e4dc30fe086 100644 --- a/www/webalizer/PLIST +++ b/www/webalizer/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/12/01 15:08:02 jlam Exp $ bin/webalizer bin/webazolver man/man1/webalizer.1 -etc/webalizer.conf.sample +share/examples/webalizer.conf.sample diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo index 2b24176a2e7..b93ee0972b5 100644 --- a/www/webalizer/distinfo +++ b/www/webalizer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:47 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/12/01 15:08:02 jlam Exp $ SHA1 (webalizer-2.01-06-src.tar.bz2) = a616cd98b3f073a1d8d759fa9146de052eb41c2f Size (webalizer-2.01-06-src.tar.bz2) = 211840 bytes -SHA1 (patch-ab) = 0b631eb754163e5fb6a74a619c0272e111959003 -SHA1 (patch-ac) = 8ee220c220237d20f947bc45d052f1ca3403dc2d -SHA1 (patch-ad) = 1ba45e09ee6058429105b0886f84cdeb47777fa7 +SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f +SHA1 (patch-ad) = ad980426c6cc582b26a88304ce421fda6ffb2b20 +SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e diff --git a/www/webalizer/patches/patch-ab b/www/webalizer/patches/patch-ab deleted file mode 100644 index b68897b755f..00000000000 --- a/www/webalizer/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2000/10/18 16:41:26 mjl Exp $ - ---- webalizer.c.orig Tue Oct 17 06:15:53 2000 -+++ webalizer.c Wed Oct 18 18:12:27 2000 -@@ -267,6 +267,8 @@ - /* check for default config file */ - if (!access("webalizer.conf",F_OK)) - get_config("webalizer.conf"); -+ else if (!access(PREFIX "/etc/webalizer.conf", F_OK)) -+ get_config(PREFIX "/etc/webalizer.conf"); - else if (!access(tmp_buf,F_OK)) - get_config(tmp_buf); - diff --git a/www/webalizer/patches/patch-ac b/www/webalizer/patches/patch-ac index a200787c31c..81a524eccd9 100644 --- a/www/webalizer/patches/patch-ac +++ b/www/webalizer/patches/patch-ac @@ -1,16 +1,13 @@ -$NetBSD: patch-ac,v 1.4 2000/10/18 16:41:26 mjl Exp $ +$NetBSD: patch-ac,v 1.5 2001/12/01 15:08:03 jlam Exp $ ---- webalizer.1.orig Wed Oct 18 18:13:37 2000 -+++ webalizer.1 Wed Oct 18 18:14:46 2000 -@@ -45,8 +45,9 @@ +--- webalizer.1.orig Thu Sep 28 23:51:42 2000 ++++ webalizer.1 +@@ -45,7 +45,7 @@ A default configuration file is scanned for. A file named \fIwebalizer.conf\fP is searched for in the current directory, and if found, it's configuration data is parsed. If the file is not -present in the current directory, the file \fI/etc/webalizer.conf\fP --is searched for and, if found, is used instead. -+present in the current directory, the files \fI@@prefix@@/etc/webalizer.conf\fP -+and then \fI/etc/webalizer.conf\fP -+are searched for and, if found, are used instead. ++present in the current directory, the file \fI@PKG_SYSCONFDIR@/webalizer.conf\fP + is searched for and, if found, is used instead. .TP 8 .B o - Any command line arguments given to the program are parsed. This diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad index ac3e6dc532a..105dd6288fc 100644 --- a/www/webalizer/patches/patch-ad +++ b/www/webalizer/patches/patch-ad @@ -1,14 +1,12 @@ -$NetBSD: patch-ad,v 1.6 2000/10/18 16:41:26 mjl Exp $ +$NetBSD: patch-ad,v 1.7 2001/12/01 15:08:03 jlam Exp $ ---- Makefile.in.orig Wed Oct 18 18:15:54 2000 -+++ Makefile.in Wed Oct 18 18:18:05 2000 -@@ -23,8 +23,8 @@ - MANDIR = @mandir@/man1 +--- Makefile.in.orig Tue Oct 17 00:15:53 2000 ++++ Makefile.in +@@ -24,7 +24,7 @@ ETCDIR = @ETCDIR@ CC = @CC@ --CFLAGS = @CFLAGS@ + CFLAGS = @CFLAGS@ -LIBS = @LIBS@ -+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\" +LIBS = @LIBS@ -lpng -ljpeg -lz -lttf -lintl -lXpm -lX11 DEFS = -DETCDIR=\"@ETCDIR@\" @DEFS@ @OPTS@ LDFLAGS= @LDFLAGS@ @@ -18,7 +16,7 @@ $NetBSD: patch-ad,v 1.6 2000/10/18 16:41:26 mjl Exp $ $(INSTALL_PROGRAM) webalizer ${BINDIR}/webalizer $(INSTALL_DATA) webalizer.1 ${MANDIR}/webalizer.1 - $(INSTALL_DATA) sample.conf ${ETCDIR}/webalizer.conf.sample -+ $(INSTALL_DATA) sample.conf ${PREFIX}/etc/webalizer.conf.sample ++ $(INSTALL_DATA) sample.conf ${PREFIX}/share/examples/webalizer.conf.sample rm -f ${BINDIR}/webazolver @LN_S@ ${BINDIR}/webalizer ${BINDIR}/webazolver diff --git a/www/webalizer/patches/patch-ae b/www/webalizer/patches/patch-ae new file mode 100644 index 00000000000..f3153c73e99 --- /dev/null +++ b/www/webalizer/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.3 2001/12/01 15:08:03 jlam Exp $ + +--- sample.conf.orig Thu Sep 28 23:51:42 2000 ++++ sample.conf +@@ -17,7 +17,7 @@ + # + # As of version 0.98, The Webalizer will look for a 'default' configuration + # file named "webalizer.conf" in the current directory, and if not found +-# there, will look for "/etc/webalizer.conf". ++# there, will look for "@PKG_SYSCONFDIR@/webalizer.conf". + + + # LogFile defines the web server log file to use. If not specified |