Changeset 137724


Ignore:
Timestamp:
Jun 18, 2015, 4:19:52 AM (4 years ago)
Author:
devans@…
Message:

libgda5: update to version 5.2.4, add variants +vala +db53 +db60 +postgresql94, drop variant +postgresql84 (long past EOL), default variants +db60 +postgresql94 +vala.

Location:
trunk/dports/databases/libgda5
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/databases/libgda5/Portfile

    r137546 r137724  
    77name                libgda5
    88set gname           libgda
    9 version             5.2.2
    10 revision            2
     9version             5.2.4
    1110license             {GPL-2 LGPL}
    1211set branch          [join [lrange [split ${version} .] 0 1] .]
     
    2423use_xz              yes
    2524
    26 checksums           rmd160  d391a7ea74d08ae4f5f5fe7ba6c49f2f254be5f9 \
    27                     sha256  c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4
     25checksums           rmd160  6e39fb20c046ff98d0bb6a347785535b9267aa1d \
     26                    sha256  2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e
    2827
    2928depends_build       port:pkgconfig \
     
    5453gobject_introspection yes
    5554
    56 patchfiles          patch-bdb.diff
     55patchfiles          patch-configure.ac.diff \
     56                    patch-bdb.diff
     57
     58#                    patch-slname.diff
    5759
    5860# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
     
    8486                    --with-jni=no
    8587
     88variant vala description {Build vala bindings and extensions} {
     89    depends_lib-append      port:vala \
     90                            port:libgee
     91    configure.env-append    VALA_API_VERSION=0.28
     92    configure.args-append   --enable-vala=yes \
     93                            --enable-gdaui-vala=yes \
     94                            --enable-vala-extensions=yes
     95}
     96
     97default_variants    +vala
     98       
    8699variant mysql5 \
    87100    description {support for current MySQL 5.x} {
     
    94107}
    95108
    96 variant postgresql84 conflicts postgresql90 postgresql91 postgresql92 postgresql93 \
    97     description {support for PostgreSQL 8.4.x} {
    98     configure.cppflags-append   "-I${prefix}/include/postgresql84"
    99     depends_lib-append  port:postgresql84
    100     configure.args-delete   --with-postgres=no
    101     configure.args-append   --with-postgres=${prefix}/lib/postgresql84
    102 }
    103 
    104 variant postgresql90 conflicts postgresql84 postgresql91 postgresql92 postgresql93 \
     109variant postgresql90 conflicts postgresql91 postgresql92 postgresql93 postgresql94 \
    105110    description {support for PostgreSQL 9.0.x} {
    106111    configure.cppflags-append   "-I${prefix}/include/postgresql90"
     
    110115}
    111116
    112 variant postgresql91 conflicts postgresql84 postgresql90 postgresql92 postgresql93 \
     117variant postgresql91 conflicts postgresql90 postgresql92 postgresql93 postgresql94 \
    113118    description {support for PostgreSQL 9.1.x} {
    114119    configure.cppflags-append   "-I${prefix}/include/postgresql91"
     
    118123}
    119124
    120 variant postgresql92 conflicts postgresql84 postgresql90 postgresql91 postgresql93 \
     125variant postgresql92 conflicts postgresql90 postgresql91 postgresql93 postgresql94 \
    121126    description {support for PostgreSQL 9.2.x} {
    122127    configure.cppflags-append   "-I${prefix}/include/postgresql92"
     
    126131}
    127132
    128 variant postgresql93 conflicts postgresql84 postgresql90 postgresql91 postgresql92 \
     133variant postgresql93 conflicts postgresql90 postgresql91 postgresql92 postgresql94 \
    129134    description {support for PostgreSQL 9.3.x} {
    130135    configure.cppflags-append   "-I${prefix}/include/postgresql93"
     
    134139}
    135140
    136 if {![variant_isset postgresql84] && \
    137     ![variant_isset postgresql90] && \
     141variant postgresql94 conflicts postgresql90 postgresql91 postgresql92 postgresql93 \
     142    description {support for PostgreSQL 9.4.x} {
     143    configure.cppflags-append   "-I${prefix}/include/postgresql94"
     144    depends_lib-append  port:postgresql94
     145    configure.args-delete   --with-postgres=no
     146    configure.args-append   --with-postgres=${prefix}/lib/postgresql94
     147}
     148
     149if {![variant_isset postgresql90] && \
    138150    ![variant_isset postgresql91] && \
    139     ![variant_isset postgresql92] } {
    140     default_variants +postgresql93
    141 }
    142 
    143 variant db47 conflicts db48 db51  \
     151    ![variant_isset postgresql92] && \
     152    ![variant_isset postgresql93] } {
     153    default_variants +postgresql94
     154}
     155
     156variant db47 conflicts db48 db51 db53 db60  \
    144157    description {support for Berkeley DB 4.7.x} {
    145158    set db_version 47
     
    151164}
    152165
    153 variant db48 conflicts db47 db51 \
     166variant db48 conflicts db47 db51 db53 db60 \
    154167    description {support for Berkeley DB 4.8.x} {
    155168    set db_version 48
     
    161174}
    162175
    163 variant db51 conflicts db47 db48 \
     176variant db51 conflicts db47 db48 db53 db60 \
    164177    description {support for Berkeley DB 5.1.x} {
    165178    set db_version 51
     
    171184}
    172185
    173 if {![variant_isset db47] && ![variant_isset db48]} {
    174     default_variants +db51
     186variant db53 conflicts db47 db48 db51 db60 \
     187    description {support for Berkeley DB 5.3.x} {
     188    set db_version 53
     189    depends_lib-append  port:db${db_version}
     190    configure.cppflags-append "-I${prefix}/include/db${db_version}"
     191    configure.args-delete   --with-bdb=no
     192    configure.args-append   --with-bdb=${prefix} \
     193                            --with-bdb-libdir-name=lib/db${db_version}
     194}
     195
     196variant db60 conflicts db47 db48 db51 db53 \
     197    description {support for Berkeley DB 6.0.x} {
     198    set db_version 60
     199    depends_lib-append  port:db${db_version}
     200    configure.cppflags-append "-I${prefix}/include/db${db_version}"
     201    configure.args-delete   --with-bdb=no
     202    configure.args-append   --with-bdb=${prefix} \
     203                            --with-bdb-libdir-name=lib/db${db_version}
     204}
     205
     206if {![variant_isset db47] && \
     207    ![variant_isset db48] && \
     208    ![variant_isset db51] && \
     209    ![variant_isset db53]} {
     210    default_variants +db60
    175211}
    176212
  • trunk/dports/databases/libgda5/files/patch-bdb.diff

    r135484 r137724  
    1 --- m4/bdb.m4.orig      2013-01-18 12:03:42.000000000 -0800
    2 +++ m4/bdb.m4   2013-10-01 12:15:14.000000000 -0700
    3 @@ -119,6 +119,9 @@
     1--- m4/bdb.m4.orig      2014-02-05 12:28:20.000000000 -0800
     2+++ m4/bdb.m4   2015-06-14 01:02:03.000000000 -0700
     3@@ -133,6 +133,9 @@
    44                if test $platform_win32 = yes
    55                then
     
    1111                    sversion=`echo $version | sed -e 's,\..*,,g'`
    1212                fi
    13 @@ -135,6 +138,12 @@
     13@@ -149,6 +152,12 @@
    1414                        db_lib="-ldb$sversion"
    1515                        db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
     
    2424                        db_libfilename="libdb-$version$bdb_libext"
    2525                        db_lib="-ldb-$version"
    26 @@ -145,7 +154,7 @@
     26@@ -159,7 +168,7 @@
    2727 
    2828                for db_hdr in $try_headers
    2929                do
    30 -                   #echo "Checking for files $d/include/$db_hdr and $db_libfile"
    31 +                   echo "Checking for files $d/include/$db_hdr and $db_libfile"
    32                     if test -f $d/include/$db_hdr -a -f $db_libfile
     30-                   #echo "Checking for files $d/$bdb_locincludedir/$db_hdr and $db_libfile"
     31+                   echo "Checking for files $d/$bdb_locincludedir/$db_hdr and $db_libfile"
     32                    if test -f $d/$bdb_locincludedir/$db_hdr -a -f $db_libfile
    3333                    then
    3434                        save_CFLAGS="$CFLAGS"
    35 @@ -222,6 +231,9 @@
     35@@ -236,6 +245,9 @@
    3636         if test "x$platform_win32" = xyes
    3737        then
     
    4343            bdbsql_loclibdir=lib
    4444        fi
    45 @@ -232,10 +244,13 @@
     45@@ -246,10 +258,13 @@
    4646     if test "x$BDB_DIR" != x
    4747     then
    4848         AC_MSG_CHECKING([for Berkeley DB SQL files along with found BDB installation])
    49 -       #echo "Checking $BDB_DIR/include/dbsql.h and $BDB_DIR/include/libdb/dbsql.h"
    50 -       if test -f $BDB_DIR/include/dbsql.h -o -f $BDB_DIR/include/libdb/dbsql.h
     49-       #echo "Checking $BDB_DIR/$bdb_locincludedir/dbsql.h and $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h"
     50-       if test -f $BDB_DIR/$bdb_locincludedir/dbsql.h -o -f $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h
    5151+       echo "Checking $BDB_DIR/include/db$sversion/dbsql.h, $BDB_DIR/include/dbsql.h and $BDB_DIR/include/libdb/dbsql.h"
    5252+       if test -f $BDB_DIR/include/db$sversion/dbsql.h -o $BDB_DIR/include/dbsql.h -o -f $BDB_DIR/include/libdb/dbsql.h
    5353        then
    54 -           if test -f $BDB_DIR/include/libdb/dbsql.h
     54-           if test -f $BDB_DIR/$bdb_locincludedir/libdb/dbsql.h
    5555+           if test -f $BDB_DIR/include/db$sversion/dbsql.h
    5656+           then
     
    6060                BDBSQL_CFLAGS="$BDB_CFLAGS/libdb"
    6161            else
    62 --- configure.ac.orig   2013-11-17 07:18:01.000000000 -0800
    63 +++ configure.ac        2013-11-19 20:42:58.000000000 -0800
    64 @@ -378,7 +378,7 @@
    65         AC_DEFINE(ENABLE_BINRELOC)
    66         br_cv_binreloc=yes
    67      fi
    68 -    PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=yes, have_ige=no)
    69 +    PKG_CHECK_MODULES(MAC_INTEGRATION, ige-mac-integration, have_ige=no, have_ige=no)
    70      if test x"$have_ige" = "xyes"
    71      then
    72         AC_DEFINE(HAVE_MAC_INTEGRATION)
    73 @@ -388,6 +388,7 @@
    74      LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
    75      LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
    76      LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
    77 +    linklibext=.dylib
    78      AC_DEFINE(HAVE_CARBON)
    79      COREDEPS_LIBS="$COREDEPS_LIBS -framework Carbon"
    80    ;;
Note: See TracChangeset for help on using the changeset viewer.