Changeset 117672


Ignore:
Timestamp:
Mar 7, 2014, 10:36:59 PM (7 years ago)
Author:
devans@…
Message:

dconf: update m4/intltool.m4 and autoreconf to fix intltool configuration, build deps, add optional vala dependency to ensure predictable configuration, increment revision.

Location:
trunk/dports/gnome/dconf
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/gnome/dconf/Portfile

    r115644 r117672  
    66name            dconf
    77version         0.18.0
     8revision        1
    89set branch      [join [lrange [split ${version} .] 0 1] .]
    910maintainers     devans openmaintainer
     
    2930depends_build   port:pkgconfig \
    3031                port:intltool \
    31                 port:gtk-doc
     32                port:gtk-doc \
     33                port:libxslt
    3234
    3335depends_lib     port:desktop-file-utils \
    3436                port:gtk3 \
    3537                port:dbus \
    36                 port:libxml2
     38                port:libxml2 \
     39                port:vala
    3740
    38 patchfiles      patch-fix-lib-names.diff
     41patchfiles      patch-fix-lib-names-Makefile.am.diff
     42
     43# update m4/intltool.m4 and autoreconf
     44
     45pre-configure {
     46    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
     47}
     48
     49use_autoreconf  yes
     50autoreconf.args -fvi
    3951
    4052configure.args  --enable-editor \
  • trunk/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff

    r117671 r117672  
    1 --- bin/Makefile.in.orig        2013-09-23 14:29:28.000000000 -0700
    2 +++ bin/Makefile.in     2013-11-16 09:55:50.000000000 -0800
    3 @@ -98,7 +98,7 @@
    4         dconf-dconf.$(OBJEXT)
    5  dconf_OBJECTS = $(am_dconf_OBJECTS)
    6  am__DEPENDENCIES_1 =
    7 -dconf_DEPENDENCIES = ../client/libdconf.so.1 $(am__DEPENDENCIES_1)
    8 +dconf_DEPENDENCIES = ../client/libdconf.1.dylib $(am__DEPENDENCIES_1)
    9  dconf_LINK = $(CCLD) $(dconf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
    10         $(LDFLAGS) -o $@
    11  AM_V_P = $(am__v_P_@AM_V@)
    12 @@ -352,7 +352,7 @@
     1--- bin/Makefile.am.orig        2014-03-07 09:32:46.000000000 -0800
     2+++ bin/Makefile.am     2014-03-07 09:37:25.000000000 -0800
     3@@ -11,7 +11,7 @@
    134        -w
    145 
     
    1910 
    2011 dconf_SOURCES = \
    21 --- client/Makefile.in.orig     2013-09-23 14:29:28.000000000 -0700
    22 +++ client/Makefile.in  2013-11-16 09:55:50.000000000 -0800
    23 @@ -83,7 +83,7 @@
    24         $(srcdir)/Makefile.am $(srcdir)/dconf.pc.in \
    25         $(top_srcdir)/aux/depcomp $(dconfclientinclude_HEADERS) \
    26         $(dconfinclude_HEADERS)
    27 -shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT)
    28 +shlib_PROGRAMS = libdconf.1.0.0.dylib$(EXEEXT)
    29  subdir = client
    30  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    31  am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
    32 @@ -363,7 +363,7 @@
    33  # initialize variables for unconditional += appending
    34  TEST_PROGS =
    35  shlibdir = $(libdir)
     12--- client/Makefile.am.orig     2014-03-07 09:38:42.000000000 -0800
     13+++ client/Makefile.am  2014-03-07 09:52:41.000000000 -0800
     14@@ -1,20 +1,20 @@
     15 include $(top_srcdir)/Makefile.gtester
     16 
     17 shlibdir=$(libdir)
     18-shlib_PROGRAMS = libdconf.so.1.0.0
    3619-nodist_noinst_DATA = libdconf.so.1 libdconf.so
     20+shlib_PROGRAMS = libdconf.1.0.0.dylib
    3721+nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
    3822 noinst_LIBRARIES = libdconf-client.a
    39  dconfinclude_HEADERS = dconf.h
    40  dconfclientinclude_HEADERS = dconf-client.h
    41 @@ -381,14 +381,14 @@
    42         ../shm/libdconf-shm-shared.a                    \
    43         $(gio_LIBS)
    44  
    45 -libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
    46 +libdconf_so_1_0_0_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib$(EXEEXT)
    47  libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
    48  EXTRA_DIST = dconf.vapi dconf.deps
    49  vapi_DATA = dconf.vapi dconf.deps
    50  vapidir = $(datadir)/vala/vapi
    51  pkgconfigdir = $(libdir)/pkgconfig
    52  pkgconfig_DATA = dconf.pc
    53 -CLEANFILES = libdconf.so.1 libdconf.so
    54 +CLEANFILES = libdconf.1.dylib libdconf.dylib
    55  all: all-am
    56  
    57  .SUFFIXES:
    58 @@ -477,8 +477,8 @@
    59  clean-shlibPROGRAMS:
    60         -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
    61  
    62 -libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
    63 -       @rm -f libdconf.so.1.0.0$(EXEEXT)
    64 +libdconf.1.0.0.dylib$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
    65 +       @rm -f libdconf.1.0.0.dylib$(EXEEXT)
    66         $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
    67  
    68  mostlyclean-compile:
    69 @@ -900,16 +900,16 @@
    70  # run tests in cwd as part of make check
    71  check-local: test-nonrecursive
    7223 
    7324-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
     
    8839+       rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib
    8940 
    90  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    91  # Otherwise a system limit (for SysV at least) may be exceeded.
    92 --- dbus-1/Makefile.in.orig     2013-09-23 14:29:28.000000000 -0700
    93 +++ dbus-1/Makefile.in  2013-11-16 09:55:50.000000000 -0800
    94 @@ -82,7 +82,7 @@
    95  DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \
    96         $(srcdir)/Makefile.am $(srcdir)/dconf-dbus-1.pc.in \
    97         $(top_srcdir)/aux/depcomp $(dconf_dbus_1include_HEADERS)
    98 -shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
    99 +shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
    100  subdir = dbus-1
    101  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    102  am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
    103 @@ -395,10 +395,10 @@
     41 dconfinclude_HEADERS = dconf.h
     42 dconfclientinclude_HEADERS = dconf-client.h
     43@@ -24,16 +24,16 @@
     44 libdconf_client_a_SOURCES = \
     45        dconf-client.c
     46 
     47-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
     48-libdconf_so_1_0_0_LDADD = \
     49+libdconf_1_0_0_dylib_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
     50+libdconf_1_0_0_dylib_LDADD = \
     51        ../engine/libdconf-engine-shared.a              \
     52        ../common/libdconf-common-shared.a              \
     53        ../gdbus/libdconf-gdbus-thread-shared.a         \
     54        ../gvdb/libgvdb-shared.a                        \
     55        ../shm/libdconf-shm-shared.a                    \
     56        $(gio_LIBS)
     57-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
     58-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
     59+libdconf_1_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib
     60+libdconf_1_0_0_dylib_SOURCES = $(libdconf_client_a_SOURCES)
     61 
     62 EXTRA_DIST = dconf.vapi dconf.deps
     63 
     64@@ -43,4 +43,4 @@
     65 pkgconfigdir = $(libdir)/pkgconfig
     66 pkgconfig_DATA = dconf.pc
     67 
     68-CLEANFILES = libdconf.so.1 libdconf.so
     69+CLEANFILES = libdconf.1.dylib libdconf.dylib
     70--- dbus-1/Makefile.am.orig     2014-03-07 09:54:03.000000000 -0800
     71+++ dbus-1/Makefile.am  2014-03-07 10:03:51.000000000 -0800
     72@@ -17,10 +17,10 @@
     73 pkgconfig_DATA = dconf-dbus-1.pc
     74 
     75 shlibdir = $(libdir)
     76-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
     77+shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib
     78 
     79-libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
     80-libdconf_dbus_1_so_0_0_0_LDADD = \
     81+libdconf_dbus_1_0_0_0_dylib_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
     82+libdconf_dbus_1_0_0_0_dylib_LDADD = \
     83        ../engine/libdconf-engine-shared.a              \
     84        ../common/libdconf-common-hidden.a              \
     85        ./libdconf-libdbus-1-shared.a                   \
     86@@ -28,20 +28,20 @@
     87        ../shm/libdconf-shm-shared.a                    \
    10488         $(dbus_LIBS)                                   \
    10589        $(glib_LIBS)
     90-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
     91-libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
     92+libdconf_dbus_1_0_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib
     93+libdconf_dbus_1_0_0_0_dylib_SOURCES = dconf-dbus-1.c
    10694 
    107 -libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
    108 +libdconf_dbus_1_so_0_0_0_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
    109  libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
    11095-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
    111 -CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
    11296+nodist_noinst_DATA = libdconf-dbus-1.dylib libdconf-dbus-1.0.dylib
    113 +CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
    114  all: all-am
    115  
    116  .SUFFIXES:
    117 @@ -492,8 +492,8 @@
    118  clean-shlibPROGRAMS:
    119         -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
    120  
    121 -libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
    122 -       @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
    123 +libdconf-dbus-1.0.0.0.dylib$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
    124 +       @rm -f libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
    125         $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
    126  
    127  mostlyclean-compile:
    128 @@ -883,16 +883,16 @@
    129  # run tests in cwd as part of make check
    130  check-local: test-nonrecursive
    13197 
    13298-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
     
    147113+       rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
    148114 
    149  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    150  # Otherwise a system limit (for SysV at least) may be exceeded.
    151 --- editor/Makefile.in.orig     2013-09-23 14:29:28.000000000 -0700
    152 +++ editor/Makefile.in  2013-11-16 09:55:50.000000000 -0800
    153 @@ -103,7 +103,7 @@
    154  dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \
    155         $(nodist_dconf_editor_OBJECTS)
    156  am__DEPENDENCIES_1 =
    157 -dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
    158 +dconf_editor_DEPENDENCIES = ../client/libdconf.1.dylib \
    159         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    160         $(am__DEPENDENCIES_1)
    161  dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
    162 @@ -355,7 +355,7 @@
    163  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
     115-CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
     116+CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
     117--- editor/Makefile.am.orig     2014-03-07 10:04:58.000000000 -0800
     118+++ editor/Makefile.am  2014-03-07 10:07:17.000000000 -0800
     119@@ -7,7 +7,7 @@
    164120 dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
     121 
    165122 dconf_editor_LDADD = \
    166123-       ../client/libdconf.so.1         \
Note: See TracChangeset for help on using the changeset viewer.