[csw-devel] SF.net SVN: gar:[6806] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Oct 9 13:21:54 CEST 2009
Revision: 6806
http://gar.svn.sourceforge.net/gar/?rev=6806&view=rev
Author: dmichelsen
Date: 2009-10-09 11:21:54 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
bdb ALL: Reapply r6805 to all bdb versions
Modified Paths:
--------------
csw/mgar/pkg/bdb43/trunk/Makefile
csw/mgar/pkg/bdb44/trunk/Makefile
csw/mgar/pkg/bdb45/trunk/Makefile
csw/mgar/pkg/bdb46/trunk/Makefile
csw/mgar/pkg/bdb47/trunk/Makefile
csw/mgar/pkg/bdb48/trunk/Makefile
Property Changed:
----------------
csw/mgar/pkg/bdb43/trunk/
csw/mgar/pkg/bdb44/trunk/
csw/mgar/pkg/bdb45/trunk/
csw/mgar/pkg/bdb46/trunk/
csw/mgar/pkg/bdb47/trunk/
csw/mgar/pkg/bdb48/trunk/
Property changes on: csw/mgar/pkg/bdb43/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb43/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb43/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -69,8 +69,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb43),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
PKGFILES_CSWbdb43doc = $(PKGFILES_DOC)
PKGFILES_CSWbdb43devel = $(PKGFILES_DEVEL)
Property changes on: csw/mgar/pkg/bdb44/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb44/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -69,8 +69,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb44),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
PKGFILES_CSWbdb44doc = $(PKGFILES_DOC)
PKGFILES_CSWbdb44devel = $(PKGFILES_DEVEL)
Property changes on: csw/mgar/pkg/bdb45/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb45/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb45/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -67,8 +67,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb45),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
# Remove the license from share/doc/berkeleydb/license/.*
# because GAR expects license to be a file instead of a directory
Property changes on: csw/mgar/pkg/bdb46/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb46/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -67,8 +67,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb46),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
# Remove the license from share/doc/berkeleydb/license/.*
# because GAR expects license to be a file instead of a directory
Property changes on: csw/mgar/pkg/bdb47/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb47/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -67,8 +67,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb47),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
# Remove the license from share/doc/berkeleydb/license/.*
# because GAR expects license to be a file instead of a directory
Property changes on: csw/mgar/pkg/bdb48/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/bdb42/trunk:6805
Modified: csw/mgar/pkg/bdb48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:09:56 UTC (rev 6805)
+++ csw/mgar/pkg/bdb48/trunk/Makefile 2009-10-09 11:21:54 UTC (rev 6806)
@@ -68,8 +68,8 @@
LICENSE = LICENSE
EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),'
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar
# Remove the license from share/doc/berkeleydb/license/.*
# because GAR expects license to be a file instead of a directory
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