>Number:         21862
>Category:       pkg
>Synopsis:       install all .ini from www/ijb; obey CFLAGS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 11 20:02:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Todd Vierling
>Release:        NetBSD 1.6.1_STABLE
>Organization:
	DUH.ORG:  Pointing out the obvious since 1994.
>Environment:
>Description:

There's more than just one sample .ini file (as there is more than one .ini
file used with the app).  All the samples should be installed.

Also, this diff fixes Makefile and patches/patch-aa so that CFLAGS
is properly honored.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ijb/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2001/02/25 04:18:23	1.3
+++ Makefile	2003/06/11 19:51:43
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:08 wiz Exp $
 #
 
 DISTNAME=	ijb20
 PKGNAME=	ijb-2.0.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.junkbuster.com/
 EXTRACT_SUFX=	.tar.Z
@@ -11,10 +12,15 @@
 HOMEPAGE=	http://www.junkbuster.com/
 COMMENT=	The Internet Junkbuster Proxy blocks unwanted banner ads and cookies
 
+MAKE_FLAGS=	MORE_CFLAGS="${CFLAGS}"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/junkbuster
 	${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${PREFIX}/share/examples/junkbuster/junkbuster.ini
+.for f in aclfile block cookie forward trust
+	${INSTALL_DATA} ${WRKSRC}/s${f}.ini ${PREFIX}/share/examples/junkbuster/s${f}.ini
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ijb/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	2001/11/01 02:17:03	1.1
+++ PLIST	2003/06/11 19:51:43
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/02/09 17:44:51 abs Exp $
 bin/junkbuster
 man/man1/junkbuster.1
 share/examples/junkbuster/junkbuster.ini
+share/examples/junkbuster/saclfile.ini
+share/examples/junkbuster/sblock.ini
+share/examples/junkbuster/scookie.ini
+share/examples/junkbuster/sforward.ini
+share/examples/junkbuster/strust.ini
 @dirrm share/examples/junkbuster
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ijb/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/20 12:02:37	1.2
+++ distinfo	2003/06/11 19:51:43
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:37 skrll Exp $
+$NetBSD$
 
 SHA1 (ijb20.tar.Z) = 2233cc5f26208058c5046168ff9ddf70312bfb75
 Size (ijb20.tar.Z) = 286005 bytes
-SHA1 (patch-aa) = 8b3e4c8ab40a8f85c6d9277b626ee71a1e34c7b9
+SHA1 (patch-aa) = a4ab1a634cc8d4aaac1ab62407084e52a8d67689
Index: patches/patch-aa
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/www/ijb/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	2000/02/09 17:44:51	1.1.1.1
+++ patches/patch-aa	2003/06/11 19:51:43
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/09 17:44:51 abs Exp $
+$NetBSD$
 
 --- Makefile.orig	Sat Oct 31 03:58:47 1998
 +++ Makefile	Wed Feb  9 16:06:35 2000
-@@ -8,7 +8,7 @@
- PROG   = junkbuster
- O      = o
- RM     = rm -f
--MORE_CFLAGS = -g
-+MORE_CFLAGS = -O2
- 
- # use this for Solaris 2.x
- #LDFLAGS = -lnsl -lsocket 
 @@ -52,7 +52,7 @@
  OBJS =	jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \
  	encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
>Release-Note:
>Audit-Trail:
>Unformatted: