[csw-devel] SF.net SVN: gar:[14203] csw/mgar/pkg/bdb3/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 14203
          http://gar.svn.sourceforge.net/gar/?rev=14203&view=rev
Author:   dmichelsen
Date:     2011-04-15 09:42:34 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
bdb3: Sanitize package names, adjust to new standards

Modified Paths:
--------------
    csw/mgar/pkg/bdb3/trunk/Makefile

Modified: csw/mgar/pkg/bdb3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/trunk/Makefile	2011-04-15 02:56:50 UTC (rev 14202)
+++ csw/mgar/pkg/bdb3/trunk/Makefile	2011-04-15 09:42:34 UTC (rev 14203)
@@ -16,20 +16,14 @@
 MASTER_SITES = http://download.oracle.com/berkeley-db/
 DISTFILES = $(NAME)-$(VERSION).tar.gz 
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHDIR = $(WORKDIR)/$(DISTNAME)
+WORKSRC = $(PATCHDIR)/build_unix
 
-# GIT Patching does not work when WORKSRC is explicitly set
-NOGITPATCH = 1
-WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix
-
-PATCHDIR = $(WORKSRC)/..
 PATCHDIRLEVEL = 0
 PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*))
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
-#BUILD64 = 1
-NOISAEXEC = 1
+BUILD64 = 1
 
 CONFIGURE_SCRIPTS = dist
 
@@ -49,7 +43,7 @@
 
 FIXCONFIG_DIRS  = $(DESTDIR)$(prefix)/bdb33/lib
 
-# bdb tests are *very* time consuming
+# There are no test scripts for bdb 3.3
 TEST_SCRIPTS =
 
 LICENSE = LICENSE
@@ -61,30 +55,32 @@
 RUNTIME_DEP_PKGS_CSWbdb3 += CSWtcl
 CHECKPKG_OVERRIDES_CSWbdb3 += catalogname-does-not-match-pkgname|pkgname=CSWbdb3|catalogname=berkeleydb3|expected-catalogname=bdb3
 
-PACKAGES += CSWbdb3devel
-CATALOGNAME_CSWbdb3devel = berkeleydb3_devel
-SPKG_DESC_CSWbdb3devel = BerkeleyDB 3.3 development support
+PACKAGES += CSWbdb3-dev
+CATALOGNAME_CSWbdb3-dev = berkeleydb3_dev
+SPKG_DESC_CSWbdb3-dev = BerkeleyDB 3.3 development support
 # Keep these in the main package
 PKGFILES_DEVEL_SHAREDLIBLINK =
-PKGFILES_CSWbdb3devel = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWbdb3devel = CSWbdb3
-CHECKPKG_OVERRIDES_CSWbdb3devel += surplus-dependency|CSWbdb3
-CHECKPKG_OVERRIDES_CSWbdb3devel += catalogname-does-not-match-pkgname|pkgname=CSWbdb3devel|catalogname=berkeleydb3_devel|expected-catalogname=bdb3devel
+PKGFILES_CSWbdb3-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWbdb3-dev = CSWbdb3
+CHECKPKG_OVERRIDES_CSWbdb3-dev += surplus-dependency|CSWbdb3
+CHECKPKG_OVERRIDES_CSWbdb3-dev += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-dev|catalogname=berkeleydb3_dev|expected-catalogname=bdb3_dev
+OBSOLETED_BY_CSWbdb3-dev = CSWbdb3devel
 
-PACKAGES += CSWbdb3doc
-CATALOGNAME_CSWbdb3doc = berkeleydb3_doc
-SPKG_DESC_CSWbdb3doc = BerkeleyDB 3.3 documentation
-PKGFILES_CSWbdb3doc = $(PKGFILES_DOC)
-ARCHALL_CSWbdb3doc = 1
-CHECKPKG_OVERRIDES_CSWbdb3doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3doc
+PACKAGES += CSWbdb3-doc
+CATALOGNAME_CSWbdb3-doc = berkeleydb3_doc
+SPKG_DESC_CSWbdb3-doc = BerkeleyDB 3.3 documentation
+PKGFILES_CSWbdb3-doc = $(PKGFILES_DOC)
+ARCHALL_CSWbdb3-doc = 1
+CHECKPKG_OVERRIDES_CSWbdb3-doc += catalogname-does-not-match-pkgname|pkgname=CSWbdb3-doc|catalogname=berkeleydb3_doc|expected-catalogname=bdb3_doc
+OBSOLETED_BY_CSWbdb3-doc = CSWbdb3doc
 
 # These are all pure examples
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/install.html
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/conf.html
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/notes.html
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/sendmail/intro.html
-CHECKPKG_OVERRIDES_CSWbdb3doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/tcl/intro.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/flags.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/install.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/conf.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/build_unix/notes.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/sendmail/intro.html
+CHECKPKG_OVERRIDES_CSWbdb3-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/berkeleydb3/ref/tcl/intro.html
 
 INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir includedir libdir
 
@@ -92,6 +88,9 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
 
+# We need the binaries
+EXTRA_MERGE_DIRS_isa-extra = $(bindir)
+
 include gar/category.mk
 
 LIBS += -lnsl


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.