pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/squid Restructuring Squid package:
details: https://anonhg.NetBSD.org/pkgsrc/rev/aee520f165b7
branches: trunk
changeset: 547123:aee520f165b7
user: taca <taca%pkgsrc.org@localhost>
date: Fri Sep 12 14:59:51 2008 +0000
description:
Restructuring Squid package:
* Now www/squid directory is common directory for squid packages.
* package options clean up and all options are described.
* LDAP helper support. (PR pkg/39386)
* DESTDIR support.
* Move some MESSAGE to documation directory.
Next, I'll import squid26, squid27 and squid30 packages.
diffstat:
www/squid/DESCR | 15 -----
www/squid/MESSAGE.FreeBSD | 15 -----
www/squid/MESSAGE.NetBSD | 15 -----
www/squid/MESSAGE.OpenBSD | 15 -----
www/squid/MESSAGE.Solaris | 10 ---
www/squid/MESSAGE.common | 14 -----
www/squid/Makefile | 122 ---------------------------------------------
www/squid/Makefile.common | 35 ++++++++----
www/squid/PLIST | 17 ------
www/squid/distinfo | 22 --------
www/squid/options.mk | 101 +++++++++++++++++++++++++++---------
www/squid/patches/patch-aa | 90 ---------------------------------
www/squid/patches/patch-ab | 13 ----
www/squid/patches/patch-ac | 17 ------
www/squid/patches/patch-ad | 13 ----
www/squid/patches/patch-ae | 13 ----
www/squid/patches/patch-af | 20 -------
www/squid/patches/patch-aj | 64 -----------------------
www/squid/patches/patch-ak | 38 --------------
www/squid/patches/patch-al | 12 ----
www/squid/patches/patch-an | 56 --------------------
www/squid/patches/patch-ap | 16 -----
www/squid/patches/patch-ar | 13 ----
www/squid/patches/patch-as | 13 ----
www/squid/patches/patch-at | 17 ------
www/squid/patches/patch-au | 109 ----------------------------------------
www/squid/patches/patch-bb | 14 -----
www/squid/patches/patch-bc | 22 --------
28 files changed, 97 insertions(+), 824 deletions(-)
diffs (truncated from 1121 to 300 lines):
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/DESCR
--- a/www/squid/DESCR Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This is the Squid Internet Object Cache developed by the National
-Laboratory for Applied Networking Research (NLANR) and Internet
-volunteers. This software is freely available for anyone to use.
-
-This software is based on the Harvest Object Cache developed by
-the University of Colorado and the University of Southern California.
-The Harvest home page is http://harvest.cs.colorado.edu/.
-
-ARPA funding for the Harvest project has ended, the squid project has
-continued development of the cache where Harvest finished.
-
-PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users%nlanr.net@localhost>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/MESSAGE.FreeBSD
--- a/www/squid/MESSAGE.FreeBSD Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.FreeBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
-
-The following parameters should work for FreeBSD:
-
-options SYSVMSG # System V-like message queues
-options SYSVSEM # System V-like semaphores
-options SYSVSHM # System V-like memory sharing
-
-options SHMMAXPGS=8192
-options MSGMNB=8192
-options MSGSSZ=64
-options MSGTQL=2048
-
-===========================================================================
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/MESSAGE.NetBSD
--- a/www/squid/MESSAGE.NetBSD Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
-
-The following parameters should work for NetBSD:
-
-options SYSVMSG # System V-like message queues
-options SYSVSEM # System V-like semaphores
-options SYSVSHM # System V-like memory sharing
-
-options SHMMAXPGS=8192
-options MSGMNB=16384
-options MSGSSZ=64
-options MSGTQL=512
-
-===========================================================================
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/MESSAGE.OpenBSD
--- a/www/squid/MESSAGE.OpenBSD Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.OpenBSD,v 1.1 2003/12/25 16:28:14 taca Exp $
-
-The following parameters should work for OpenBSD:
-
-options SYSVMSG # System V-like message queues
-options SYSVSEM # System V-like semaphores
-options SYSVSHM # System V-like memory sharing
-
-options SHMMAXPGS=8192
-options MSGMNB=16384
-options MSGSSZ=64
-options MSGTQL=1024
-
-===========================================================================
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/MESSAGE.Solaris
--- a/www/squid/MESSAGE.Solaris Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Solaris,v 1.1 2003/12/25 16:28:14 taca Exp $
-
-The following parameters in /etc/system should work for Solaris:
-
-set shmsys:shminfo_shmmax=2097152
-set shmsys:shminfo_shmmni=32
-set shmsys:shminfo_shmseg=16
-
-===========================================================================
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/MESSAGE.common
--- a/www/squid/MESSAGE.common Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.common,v 1.2 2007/02/25 07:34:45 taca Exp $
-
-You DO need running nameservice to start and run ${PKGNAME}.
-
-Use the ${PKGNAME} proxy and caching WWW Server by
-configuring your WWW Navigator (Netscape, Mosaic, ...)
-to use it as a proxy server.
-
-Please note that to use the diskd storage method, you'll likely have to
-change SYSV-IPC parameters in the kernel config file (see
-http://wiki.squid-cache.org/SquidFaq/DiskDaemon for details)
-
-===========================================================================
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/Makefile
--- a/www/squid/Makefile Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# $NetBSD: Makefile,v 1.207 2008/06/29 01:02:08 taca Exp $
-
-DISTNAME= squid-2.6.STABLE21
-PKGNAME= ${DISTNAME:S/STABLE//}
-CATEGORIES= www
-MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= taca%NetBSD.org@localhost
-HOMEPAGE= http://www.squid-cache.org/
-COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-
-DOCDIR= ${PREFIX}/share/doc/squid
-EXAMPLESDIR= ${PREFIX}/share/examples/squid
-
-DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt
-
-USE_TOOLS+= perl
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
- --localstatedir=${SQUID_DATADIR:Q}
-
-MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
-MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
-PLIST_SRC= ${WRKDIR}/PLIST
-RCD_SCRIPTS= squid
-
-CONF_FILES+= ${EXAMPLESDIR}/cachemgr.conf ${PKG_SYSCONFDIR}/cachemgr.conf
-CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
-CONF_FILES+= ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
-CONF_FILES+= ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
-OWN_DIRS= ${SQUID_DATADIR}
-OWN_DIRS_PERMS+= ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
- ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
-EXAMPLES_FILES= src/mime.conf.default src/squid.conf.default \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- tools/cachemgr.conf
-
-.include "../../mk/bsd.prefs.mk"
-.include "Makefile.common"
-
-BUILD_DEFS+= LOGDIR VARBASE
-
-CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \
- --enable-cachemgr-hostname=localhost \
- --enable-delay-pools \
- --enable-removal-policies=lru,heap \
- --enable-poll \
- --enable-underscores \
- --enable-storeio=${SQUID_BACKENDS:Q} \
- --with-aio
-
-#
-# generic helpers
-#
-OPTIONAL_FILES+= bin/cossdump libexec/diskd-daemon libexec/dnsserver
-OPTIONAL_FILES+= libexec/pinger libexec/unlinkd
-#
-# basic auth helpers (except LDAP, multi-domain-NTLM and SASL)
-#
-OPTIONAL_FILES+= libexec/getpwname_auth libexec/msnt_auth libexec/ncsa_auth
-OPTIONAL_FILES+= libexec/pam_auth ${PKGMANDIR}/man8/ncsa_auth.8
-OPTIONAL_FILES+= ${PKGMANDIR}/man8/pam_auth.8
-OPTIONAL_FILES+= libexec/smb_auth libexec/yp_auth libexec/wb_auth
-#
-# digest auth helpers
-#
-OPTIONAL_FILES+= libexec/digest_pw_auth
-#
-# ntlm auth helpers (except no_check and winbind)
-#
-OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth
-OPTIONAL_FILES+= libexec/wb_ntlmauth ${PKGMANDIR}/man8/squid_unix_group.8
-#
-# external acl helpers (except ldap_group, wbinfo_group and winbind_group)
-#
-OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
-
-SUBST_CLASSES+= confs
-SUBST_STAGE.confs= pre-configure
-SUBST_FILES.confs= src/cf.data.pre
-SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/"
-SUBST_MESSAGE.confs= Fixing configuration files.
-
-CHECK_PORTABILITY_SKIP+= icons/icons.shar
-
-INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin ${DOCDIR} \
- ${EXAMPLESDIR} share/squid/errors share/squid/icons
-
-post-install:
-.for f in ${EXAMPLES_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/`basename ${f} .default`
-.endfor
- ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- cd ${WRKSRC}; \
- for i in ${DOCFILES}; do \
- ${INSTALL_DATA} $$i ${DOCDIR}; \
- done
- ( \
- for i in ${OPTIONAL_FILES}; do \
- ${TEST} ! -r ${PREFIX}/$$i || ${ECHO} $$i; \
- done; \
- cd ${WRKSRC}/errors; \
- for i in *; do \
- ${TEST} -d $$i && \
- (${LS} $$i/ERR_* | \
- ${SED} -e 's@^@share/squid/errors/@'; \
- ${ECHO} "@dirrm share/squid/errors/$$i"); \
- done; \
- ${ECHO} "@dirrm share/squid/errors"; \
- cd ${WRKSRC}/icons; \
- ${LS} anthony-*.gif | \
- ${SED} -e 's@^@share/squid/icons/@'; \
- ${ECHO} "@dirrm share/squid/icons"; \
- ${ECHO} "share/squid/mib.txt"; \
- ${ECHO} "@dirrm share/squid" \
- ) >>${PLIST_SRC}
-
-.include "options.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/Makefile.common
--- a/www/squid/Makefile.common Fri Sep 12 14:54:27 2008 +0000
+++ b/www/squid/Makefile.common Fri Sep 12 14:59:51 2008 +0000
@@ -1,17 +1,26 @@
-# $NetBSD: Makefile.common,v 1.1 2007/12/20 03:17:14 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2008/09/12 14:59:52 taca Exp $
+
+BUILD_DEFS+= LOGDIR VARBASE
+DOCDIR= share/doc/squid
+EGDIR= share/examples/squid
SQUID_DATADIR= ${VARBASE}/squid
-LOGDIR?= ${SQUID_DATADIR}/logs
+
+LOGDIR?= ${SQUID_DATADIR}/logs
-PKG_SYSCONFSUBDIR?= squid
-
-SQUID_USER?= squid
-SQUID_GROUP?= squid
+#
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
-PKG_GROUPS_VARS+= SQUID_GROUP
-PKG_USERS_VARS+= SQUID_USER
-
-PKG_GROUPS= ${SQUID_GROUP}
-PKG_USERS= ${SQUID_USER}:${SQUID_GROUP}
-
-PKG_GECOS.${SQUID_USER}= Squid Web-Cache pseudo-user
+CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR:Q} \
+ --localstatedir=${SQUID_DATADIR:Q} \
+ --datarootdir=${PREFIX}/share/squid \
+ --enable-auth=basic,digest,ntlm \
+ --enable-cachemgr-hostname=localhost \
+ --enable-delay-pools \
+ --enable-icmp \
+ --enable-removal-policies=lru,heap \
+ --enable-poll \
+ --enable-underscores \
+ --enable-storeio=${SQUID_BACKENDS:Q} \
+ --with-aio
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/PLIST
--- a/www/squid/PLIST Fri Sep 12 14:54:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.21 2006/09/26 03:40:20 taca Exp $
-bin/squidclient
-libexec/cachemgr.cgi
-man/man8/cachemgr.cgi.8
-man/man8/squid.8
-sbin/RunCache
-sbin/squid
-share/doc/squid/ChangeLog
-share/doc/squid/RELEASENOTES.html
-share/doc/squid/debug-sections.txt
-share/examples/rc.d/squid
-share/examples/squid/cachemgr.conf
-share/examples/squid/mime.conf
-share/examples/squid/msntauth.conf
-share/examples/squid/squid.conf
-@dirrm share/doc/squid
-@dirrm share/examples/squid
diff -r 82a8ba5a90a7 -r aee520f165b7 www/squid/distinfo
--- a/www/squid/distinfo Fri Sep 12 14:54:27 2008 +0000
Home |
Main Index |
Thread Index |
Old Index