Skip to content
Permalink
Browse files

dconf: update m4/intltool.m4 and autoreconf to fix intltool configura…

…tion, build deps, add optional vala dependency to ensure predictable configuration, increment revision.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@117672 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
dbevans committed Mar 7, 2014
1 parent 79ff151 commit bb9f766204c76f46aee371a7a94d60489c275957
Showing with 142 additions and 173 deletions.
  1. +15 −3 gnome/dconf/Portfile
  2. +127 −0 gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff
  3. +0 −170 gnome/dconf/files/patch-fix-lib-names.diff
@@ -5,6 +5,7 @@ PortSystem 1.0

name dconf
version 0.18.0
revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -28,14 +29,25 @@ checksums rmd160 2d010c1998f093878f4be4ce8b46ee6066c9f9af \

depends_build port:pkgconfig \
port:intltool \
port:gtk-doc
port:gtk-doc \
port:libxslt

depends_lib port:desktop-file-utils \
port:gtk3 \
port:dbus \
port:libxml2
port:libxml2 \
port:vala

patchfiles patch-fix-lib-names.diff
patchfiles patch-fix-lib-names-Makefile.am.diff

# update m4/intltool.m4 and autoreconf

pre-configure {
copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
}

use_autoreconf yes
autoreconf.args -fvi

configure.args --enable-editor \
--disable-schemas-compile \
@@ -0,0 +1,127 @@
--- bin/Makefile.am.orig 2014-03-07 09:32:46.000000000 -0800
+++ bin/Makefile.am 2014-03-07 09:37:25.000000000 -0800
@@ -11,7 +11,7 @@
-w

dconf_LDADD = \
- ../client/libdconf.so.1 \
+ ../client/libdconf.1.dylib \
$(gio_LIBS)

dconf_SOURCES = \
--- client/Makefile.am.orig 2014-03-07 09:38:42.000000000 -0800
+++ client/Makefile.am 2014-03-07 09:52:41.000000000 -0800
@@ -1,20 +1,20 @@
include $(top_srcdir)/Makefile.gtester

shlibdir=$(libdir)
-shlib_PROGRAMS = libdconf.so.1.0.0
-nodist_noinst_DATA = libdconf.so.1 libdconf.so
+shlib_PROGRAMS = libdconf.1.0.0.dylib
+nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
noinst_LIBRARIES = libdconf-client.a

-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
+libdconf.1.dylib libdconf.dylib: libdconf.1.0.0.dylib
+ $(AM_V_GEN) ln -fs libdconf.1.0.0.dylib $@

install-data-hook:
- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.1.dylib
+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.dylib

uninstall-hook:
- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
+ rm -f $(DESTDIR)$(shlibdir)/libdconf.1.dylib
+ rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib

dconfinclude_HEADERS = dconf.h
dconfclientinclude_HEADERS = dconf-client.h
@@ -24,16 +24,16 @@
libdconf_client_a_SOURCES = \
dconf-client.c

-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
-libdconf_so_1_0_0_LDADD = \
+libdconf_1_0_0_dylib_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
+libdconf_1_0_0_dylib_LDADD = \
../engine/libdconf-engine-shared.a \
../common/libdconf-common-shared.a \
../gdbus/libdconf-gdbus-thread-shared.a \
../gvdb/libgvdb-shared.a \
../shm/libdconf-shm-shared.a \
$(gio_LIBS)
-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
+libdconf_1_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib
+libdconf_1_0_0_dylib_SOURCES = $(libdconf_client_a_SOURCES)

EXTRA_DIST = dconf.vapi dconf.deps

@@ -43,4 +43,4 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dconf.pc

-CLEANFILES = libdconf.so.1 libdconf.so
+CLEANFILES = libdconf.1.dylib libdconf.dylib
--- dbus-1/Makefile.am.orig 2014-03-07 09:54:03.000000000 -0800
+++ dbus-1/Makefile.am 2014-03-07 10:03:51.000000000 -0800
@@ -17,10 +17,10 @@
pkgconfig_DATA = dconf-dbus-1.pc

shlibdir = $(libdir)
-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
+shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib

-libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
-libdconf_dbus_1_so_0_0_0_LDADD = \
+libdconf_dbus_1_0_0_0_dylib_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
+libdconf_dbus_1_0_0_0_dylib_LDADD = \
../engine/libdconf-engine-shared.a \
../common/libdconf-common-hidden.a \
./libdconf-libdbus-1-shared.a \
@@ -28,20 +28,20 @@
../shm/libdconf-shm-shared.a \
$(dbus_LIBS) \
$(glib_LIBS)
-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
-libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
+libdconf_dbus_1_0_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib
+libdconf_dbus_1_0_0_0_dylib_SOURCES = dconf-dbus-1.c

-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
+nodist_noinst_DATA = libdconf-dbus-1.dylib libdconf-dbus-1.0.dylib

-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
+libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib: libdconf-dbus-1.0.0.0.dylib
+ $(AM_V_GEN) ln -fs libdconf-dbus-1.0.0.0.dylib $@

install-data-hook:
- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib

uninstall-hook:
- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib

-CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
+CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
--- editor/Makefile.am.orig 2014-03-07 10:04:58.000000000 -0800
+++ editor/Makefile.am 2014-03-07 10:07:17.000000000 -0800
@@ -7,7 +7,7 @@
dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf

dconf_editor_LDADD = \
- ../client/libdconf.so.1 \
+ ../client/libdconf.1.dylib \
$(gtk_LIBS) \
$(gee_LIBS) \
$(gmodule_LIBS) \

This file was deleted.

0 comments on commit bb9f766

Please sign in to comment.
You can’t perform that action at this time.