[csw-devel] SF.net SVN: gar:[4589] csw/mgar/pkg
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Mon Apr 27 20:18:33 CEST 2009
Revision: 4589
http://gar.svn.sourceforge.net/gar/?rev=4589&view=rev
Author: valholla
Date: 2009-04-27 18:18:33 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
misc checkin
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
csw/mgar/pkg/squid/trunk/Makefile
csw/mgar/pkg/squid/trunk/checksums
csw/mgar/pkg/squirrelmail/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gcc4/Makefile
csw/mgar/pkg/gcc4/branches/
csw/mgar/pkg/gcc4/tags/
csw/mgar/pkg/libffi/Makefile
Removed Paths:
-------------
csw/mgar/pkg/php5-apache/
csw/mgar/pkg/php5-apache2/
csw/mgar/pkg/sudo-ldap/
Property Changed:
----------------
csw/mgar/pkg/squid/trunk/
Added: csw/mgar/pkg/gcc4/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/Makefile (rev 0)
+++ csw/mgar/pkg/gcc4/Makefile 2009-04-27 18:18:33 UTC (rev 4589)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-27 18:16:39 UTC (rev 4588)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-04-27 18:18:33 UTC (rev 4589)
@@ -26,7 +26,7 @@
merge-i386-files:
@echo "[===== Merging isa-i386 =====]"
- $(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/bin $(PKGROOT))
+ $(_DBG)(cd $(IPREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/i386)
$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/include $(PKGROOT))
$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/info $(PKGROOT))
$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/man $(PKGROOT))
@@ -45,51 +45,48 @@
$(_DBG)$(MAKECOOKIE)
ifeq ($(shell uname -p), i386)
-ISAEXEC_DIRS = /opt/csw/gcc4/bin
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES += /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES += /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-c++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-g++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-gcc
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-gcc-4.3.3
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-gcj
-ISAEXEC_FILES += /opt/csw/gcc4/bin/i386-pc-solaris2.8-gfortran
+EXTRA_PKGFILES_CSWgcc4core = l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gcc
+EXTRA_PKGFILES_CSWgcc4core += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/cpp
+
+EXTRA_PKGFILES_CSWgcc4g++ = l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/c++
+EXTRA_PKGFILES_CSWgcc4g++ += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/g++
+
+EXTRA_PKGFILES_CSWgcc4gfortran = l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gfortran
+
+EXTRA_PKGFILES_CSWgcc4java = l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gcj
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gcov
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gccbug
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/addr2name.awk
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gc-analyze
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gcjh
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gjarsigner
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/grmic
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gjavah
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/grmid
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/jcf-dump
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gkeytool
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/grmiregistry
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/jv-convert
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gij
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnative2ascii
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gserialver
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gappletviewer
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gcj-dbtool
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gjar
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gorbd
+EXTRA_PKGFILES_CSWgcc4java += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gtnameserv
+
+EXTRA_PKGFILES_CSWgcc4ada = l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnat
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatbind
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatbl
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatchop
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatclean
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatfind
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatkr
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatlink
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatls
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatmake
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatname
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatprep
+EXTRA_PKGFILES_CSWgcc4ada += l none /opt/csw/bin/isaexec=/opt/csw/gcc4/bin/gnatxref
endif
Added: csw/mgar/pkg/libffi/Makefile
===================================================================
--- csw/mgar/pkg/libffi/Makefile (rev 0)
+++ csw/mgar/pkg/libffi/Makefile 2009-04-27 18:18:33 UTC (rev 4589)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Property changes on: csw/mgar/pkg/squid/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile 2009-04-27 18:16:39 UTC (rev 4588)
+++ csw/mgar/pkg/squid/trunk/Makefile 2009-04-27 18:18:33 UTC (rev 4589)
@@ -1,9 +1,10 @@
GARNAME = squid
-GARVERSION = 2.7
+GARVERSION = 3.0
CATEGORIES = server
-RELEASE = STABLE3
+RELEASE = STABLE14
DISTVERSION = $(GARVERSION).$(RELEASE)
DISTNAME = $(GARNAME)-$(DISTVERSION)
+RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/')
DESCRIPTION = High performance Web proxy cache
define BLURB
@@ -12,31 +13,36 @@
bandwith usage. Squid runs on all popular Unix and Windows platforms.
endef
-MASTER_SITES = http://www.squid-cache.org/Versions/v2/2.7/
+MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(GARVERSION)/
DISTFILES = $(DISTNAME).tar.bz2
-DISTFILES += $(call admfiles,CSWsquid, depend prototype copyright postinstall preremove)
-CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man
-CONFIGURE_ARGS += --localstatedir=/var/$(prefix)
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static
CONFIGURE_ARGS += --datadir=$(datadir)/$(GARNAME)
CONFIGURE_ARGS += --with-large-files
CONFIGURE_ARGS += --enable-large-cache-files
CONFIGURE_ARGS += --enable-ssl
+CONFIGURE_ARGS += --with-openssl=$(prefix)
CONFIGURE_ARGS += --enable-icmp
CONFIGURE_ARGS += --enable-delay-pools
CONFIGURE_ARGS += --enable-useragent-log
CONFIGURE_ARGS += --enable-referer-log
CONFIGURE_ARGS += --enable-arp-acl
CONFIGURE_ARGS += --enable-snmp
-CONFIGURE_ARGS += --enable-auth=basic
-CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA
+#CONFIGURE_ARGS += --enable-auth=basic
+#CONFIGURE_ARGS += --enable-basic-auth-helpers=LDAP,SMB,YP,PAM,SASL,NCSA
TEST_TARGET = check
include gar/category.mk
+
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE)
-post-install:
+pre-configure-modulated:
+ cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh
+ @$(MAKECOOKIE)
+
+post-install-modulated:
( cp -r $(FILEDIR)/etc $(DESTDIR)/etc )
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums 2009-04-27 18:16:39 UTC (rev 4588)
+++ csw/mgar/pkg/squid/trunk/checksums 2009-04-27 18:18:33 UTC (rev 4589)
@@ -1,7 +1 @@
-eb49bc06ea1a40421b6f1ac9e76d1757 download/squid-2.6.STABLE18.tar.bz2
-18288c834ba98c10a67d0cfc07445879 download/CSWsquid.gspec
-1c3e1327ace797a240fc66e36a127f59 download/CSWsquid.depend
-ca01a650e044db58f282732f8b9ddbc5 download/CSWsquid.prototype
-c492e2d6d32ec5c1aad0e0609a141ce9 download/CSWsquid.copyright
-84f3b2fdb7dfd33f05096f5b2051e80e download/CSWsquid.postinstall
-97d93eadab6a33c4e0cabf76b351364d download/CSWsquid.preremove
+7aaff2319d2263404d788a82a10c8633 download/squid-3.0.STABLE14.tar.bz2
Modified: csw/mgar/pkg/squirrelmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squirrelmail/trunk/Makefile 2009-04-27 18:16:39 UTC (rev 4588)
+++ csw/mgar/pkg/squirrelmail/trunk/Makefile 2009-04-27 18:18:33 UTC (rev 4589)
@@ -13,6 +13,7 @@
MIME support, address books, and folder manipulation.
endef
+ARCHALL = 1
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
@@ -20,13 +21,18 @@
CATALOGNAME_CSWsquirrelmail = squirrelmail
SPKG_DESC_CSWsquirrelmail = $(DESCRIPTION)
-REQUIRED_PKGS_CSWsquirrelmail = CSWimaprt
+REQUIRED_PKGS_CSWsquirrelmail = CSWimap CSWapache2c
# We define upstream file regex so we can be notifed of
# new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_SCRIPTS = cswize
+configure-cswize:
+ @(perl -i -pe 's|/var/local|/opt/csw|' $(WORKSRC)/config/config_default.php)
+ @(perl -i -pe 's|/usr/sbin/sendmail|/usr/lib/sendmail|' \
+ $(WORKSRC)/config/config_default.php)
+ @$(MAKECOOKIE)
include gar/category.mk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list