SF.net SVN: gar:[22643] csw/mgar/pkg/cpan/DBD-Sybase/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22643
          http://gar.svn.sourceforge.net/gar/?rev=22643&view=rev
Author:   dmichelsen
Date:     2013-12-05 14:56:57 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
cpan/DBD-Sybase/trunk: Update to Sybase 15

Modified Paths:
--------------
    csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums

Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile	2013-12-05 14:52:06 UTC (rev 22642)
+++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile	2013-12-05 14:56:57 UTC (rev 22643)
@@ -1,5 +1,5 @@
 NAME = DBD-Sybase
-VERSION = 1.11
+VERSION = 1.15
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = MEWP
@@ -9,7 +9,7 @@
 endef
 
 DISTFILES = COPYING
-PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch
+# PATCHFILES = 0001-Use-CS_UNITEXT_TYPE-only-when-available.patch
 
 EXTRA_MODULATORS = DBDRIVER
 MODULATIONS_DBDRIVER = ocs freetds
@@ -17,37 +17,55 @@
 # I just don't have Sybase x86 OCS in 32 bit
 SKIP_MODULATIONS = isa-i386-dbdriver-ocs
 
-PACKAGES = CSWpm-dbd-sybase-ocs CSWpm-dbd-sybase-freetds
-
-CATALOGNAME_CSWpm-dbd-sybase-ocs     = pm_dbd_sybase_ocs
-CATALOGNAME_CSWpm-dbd-sybase-freetds = pm_dbd_sybase_freetds
-
-SPKG_DESC_CSWpm-dbd-sybase-ocs     = $(DESCRIPTION) (Linked against Sybase OCS)
+PACKAGES += CSWpm-dbd-sybase-freetds
 SPKG_DESC_CSWpm-dbd-sybase-freetds = $(DESCRIPTION) (Linked against FreeTDS)
-
 # The "standard" is to link against Sybase OCS as it does not have additional
 # dependencies. If you don't have that you can *additionally* install
 # the version linked against FreeTDS pulling in all additional dependencies.
 RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWfreetds
-RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-ocs     += CSWpm-dbd-sybase-freetds
+RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-freetds += CSWlibct4
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-freetds += bad-rpath-entry|/lib|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-freetds.so
 
-SYBASE_ocs = /opt/csw/sybase/OCS-12_5
+PACKAGES += CSWpm-dbd-sybase-ocs
+SPKG_DESC_CSWpm-dbd-sybase-ocs = $(DESCRIPTION) (Linked against Sybase OCS)
+PKGFILES_CSWpm-dbd-sybase-ocs = $(DBDSYBASEDIR)/.*-ocs\..*
+RUNTIME_DEP_PKGS_CSWpm-dbd-sybase-ocs += CSWpm-dbd-sybase-freetds
+
+# These are provided by the Sybase OCS libraries
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybintl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybblk.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libsybcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+
+# These are just examples
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-freetds += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/DBD/Sybase.pm
+
+CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += bad-rpath-entry|/lib|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
+
+SYBASE_ocs = /opt/csw/sybase/OCS-15_0
 SYBASE_freetds = /opt/csw
-SYBASE = $(SYBASE_$(DBDRIVER))
 
-LD_LIBRARY_PATH = $(SYBASE)/lib
-
 NOISALIST = 1
 EXTRA_LIB = $(SYBASE)/lib
 
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
-EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH
+EXTRA_CONFIGURE_EXPORTS += SYBASE
+CONFIGURE_ENV_SYBASE = $(SYBASE_$(DBDRIVER))
+EXTRA_CONFIGURE_EXPORTS += LD_LIBRARY_PATH
+CONFIGURE_ENV_LD_LIBRARY_PATH = $(SYBASE)/lib
+
 PERL_CONFIGURE_ARGS = --accept_test_defaults --chained Y --threaded_libs N
 
-EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH
+EXTRA_TEST_EXPORTS += LD_LIBRARY_PATH
+TEST_ENV_LD_LIBRARY_PATH = $(SYBASE)/lib
 
 # We need a running database for this
 TEST_SCRIPTS ?=
@@ -61,8 +79,6 @@
 EXTRA_PAX_ARGS  = -s ",/Sybase\.bs$$,/Sybase-$(DBDRIVER).bs,p"
 EXTRA_PAX_ARGS += -s ",/Sybase\.so$$,/Sybase-$(DBDRIVER).so,p"
 
-PKGFILES_CSWpm-dbd-sybase-ocs = $(DBDSYBASEDIR)/.*-ocs\..*
-
 ALTERNATIVES_CSWpm-dbd-sybase-ocs = ocs
 ALTERNATIVES_CSWpm-dbd-sybase-freetds = freetds
 ALTERNATIVE_ocs  = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-ocs.so 200
@@ -70,10 +86,4 @@
 ALTERNATIVE_freetds  = $(DBDSYBASEDIR)/Sybase.so so $(DBDSYBASEDIR)/Sybase-freetds.so 100
 ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs
 
-# These are provided by the Sybase OCS libraries
-CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
-CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
-CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
-CHECKPKG_OVERRIDES_CSWpm-dbd-sybase-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so
-
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums	2013-12-05 14:52:06 UTC (rev 22642)
+++ csw/mgar/pkg/cpan/DBD-Sybase/trunk/checksums	2013-12-05 14:56:57 UTC (rev 22643)
@@ -1 +1 @@
-7bbad79fcfc34195e6a3a8418277e64d  DBD-Sybase-1.11.tar.gz
+d76f09f9a25896fd879ef89a98748708  DBD-Sybase-1.15.tar.gz

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