Revision: 118451 https://trac.macports.org/changeset/118451 Author: devans@macports.org Date: 2014-04-02 12:13:52 -0700 (Wed, 02 Apr 2014) Log Message: ----------- libepc: use upstream autogen.sh to reconfigure with our intltool.m4, fixes possible intltool configure error, update patchfiles, build deps. Modified Paths: -------------- trunk/dports/gnome/libepc/Portfile Added Paths: ----------- trunk/dports/gnome/libepc/files/autogen.sh trunk/dports/gnome/libepc/files/patch-Makefile.am.diff trunk/dports/gnome/libepc/files/patch-configure.ac.diff Removed Paths: ------------- trunk/dports/gnome/libepc/files/patch-Makefile.in.diff trunk/dports/gnome/libepc/files/patch-configure.diff Modified: trunk/dports/gnome/libepc/Portfile =================================================================== --- trunk/dports/gnome/libepc/Portfile 2014-04-02 17:43:02 UTC (rev 118450) +++ trunk/dports/gnome/libepc/Portfile 2014-04-02 19:13:52 UTC (rev 118451) @@ -28,14 +28,27 @@ sha256 4f98fc306c0f9d361e1381484744246efd084053732924741078270c49afc33b depends_build port:pkgconfig \ - port:intltool + port:intltool \ + port:gtk-doc \ + port:gnome-common \ + port:autoconf \ + port:automake \ + port:libtool depends_lib port:gtk3 \ port:avahi \ port:libsoup \ port:ossp-uuid -patchfiles patch-configure.diff \ - patch-Makefile.in.diff +patchfiles patch-configure.ac.diff \ + patch-Makefile.am.diff +# use upstream autogen.sh to reconfigure with our intltool.m4 + +post-patch { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} +} + +configure.cmd ./autogen.sh + livecheck.type gnome Added: trunk/dports/gnome/libepc/files/autogen.sh =================================================================== --- trunk/dports/gnome/libepc/files/autogen.sh (rev 0) +++ trunk/dports/gnome/libepc/files/autogen.sh 2014-04-02 19:13:52 UTC (rev 118451) @@ -0,0 +1,13 @@ +#!/bin/sh + +srcdir=`dirname $0` +[ -z "$srcdir" ] && srcdir=. + +PKG_NAME=libepc + +if [ ! -f "$srcdir/libepc/publisher.c" ]; then + echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2 + exit 1 +fi + +. gnome-autogen.sh Added: trunk/dports/gnome/libepc/files/patch-Makefile.am.diff =================================================================== --- trunk/dports/gnome/libepc/files/patch-Makefile.am.diff (rev 0) +++ trunk/dports/gnome/libepc/files/patch-Makefile.am.diff 2014-04-02 19:13:52 UTC (rev 118451) @@ -0,0 +1,111 @@ +--- Makefile.am.orig 2014-03-28 11:08:27.000000000 -0700 ++++ Makefile.am 2014-03-28 11:11:08.000000000 -0700 +@@ -25,34 +25,6 @@ + lib_LTLIBRARIES = \ + libepc/libepc-1.0.la \ + libepc-ui/libepc-ui-1.0.la +-noinst_LTLIBRARIES = \ +- tests/libepc-tests.la +-noinst_PROGRAMS = \ +- examples/list-resources \ +- examples/lookup-resource \ +- examples/service-browser \ +- examples/simple-publisher \ +- examples/consumer-ui \ +- examples/publisher-ui \ +- examples/server-credentials \ +- $(TESTS) +-TESTS = \ +- tests/test-consumer-by-info \ +- tests/test-consumer-by-name \ +- tests/test-dispatcher-local-collision \ +- tests/test-dispatcher-multiple-services \ +- tests/test-dispatcher-rename \ +- tests/test-dispatcher-reset \ +- tests/test-dispatcher-simple-service \ +- tests/test-dispatcher-subtypes \ +- tests/test-dispatcher-unique \ +- tests/test-expand-name \ +- tests/test-progress-hooks \ +- tests/test-publisher-bookmarks \ +- tests/test-publisher-change-name \ +- tests/test-publisher-libsoup-494128 \ +- tests/test-publisher-unique \ +- tests/test-service-type + + # ================ + # -- FILE LISTS -- +@@ -134,11 +106,6 @@ + -DLOCALEDIR=\"$(localedir)\" \ + -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" + +-example_epc_cflags = $(AM_CFLAGS) $(LIBEPC_CFLAGS) +-example_epc_libs = libepc/libepc-1.0.la $(LIBEPC_LIBS) +-example_epc_ui_cflags = $(example_epc_cflags) $(LIBEPC_UI_CFLAGS) +-example_epc_ui_libs = $(example_epc_libs) libepc-ui/libepc-ui-1.0.la $(LIBEPC_UI_LIBS) +- + libepc_libepc_1_0_la_CFLAGS = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\" + libepc_libepc_1_0_la_LDFLAGS = $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO) + +@@ -146,61 +113,6 @@ + libepc_ui_libepc_ui_1_0_la_LDFLAGS = $(LIBEPC_UI_LIBS) -version-info $(LT_VERSION_INFO) + libepc_ui_libepc_ui_1_0_la_LIBADD = libepc/libepc-1.0.la + +-examples_list_resources_CFLAGS = $(example_epc_cflags) +-examples_list_resources_LDADD = $(example_epc_libs) +-examples_lookup_resource_CFLAGS = $(example_epc_cflags) +-examples_lookup_resource_LDADD = $(example_epc_libs) +-examples_service_browser_CFLAGS = $(example_epc_cflags) +-examples_service_browser_LDADD = $(example_epc_libs) +-examples_simple_publisher_CFLAGS = $(example_epc_cflags) +-examples_simple_publisher_LDADD = $(example_epc_libs) +- +-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) +-examples_server_credentials_LDADD = $(example_epc_ui_libs) +- +- +-test_epc_libs = tests/libepc-tests.la $(example_epc_libs) +-test_epc_ui_libs = tests/libepc-tests.la $(example_epc_ui_libs) +- +-tests_libepc_tests_la_CFLAGS = $(example_epc_cflags) +- +-tests_test_consumer_by_info_CFLAGS = $(example_epc_cflags) +-tests_test_consumer_by_info_LDADD = $(test_epc_libs) +-tests_test_consumer_by_name_CFLAGS = $(example_epc_cflags) +-tests_test_consumer_by_name_LDADD = $(test_epc_libs) +-tests_test_dispatcher_local_collision_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_local_collision_LDADD = $(test_epc_libs) +-tests_test_dispatcher_multiple_services_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_multiple_services_LDADD = $(test_epc_libs) +-tests_test_dispatcher_rename_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_rename_LDADD = $(test_epc_libs) +-tests_test_dispatcher_reset_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_reset_LDADD = $(test_epc_libs) +-tests_test_dispatcher_simple_service_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_simple_service_LDADD = $(test_epc_libs) +-tests_test_dispatcher_subtypes_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_subtypes_LDADD = $(test_epc_libs) +-tests_test_dispatcher_unique_CFLAGS = $(example_epc_cflags) +-tests_test_dispatcher_unique_LDADD = $(test_epc_libs) +-tests_test_expand_name_CFLAGS = $(example_epc_cflags) +-tests_test_expand_name_LDADD = $(test_epc_libs) +-tests_test_progress_hooks_CFLAGS = $(example_epc_ui_cflags) +-tests_test_progress_hooks_LDADD = $(test_epc_ui_libs) +-tests_test_publisher_bookmarks_CFLAGS = $(example_epc_cflags) +-tests_test_publisher_bookmarks_LDADD = $(test_epc_libs) +-tests_test_publisher_change_name_CFLAGS = $(example_epc_cflags) +-tests_test_publisher_change_name_LDADD = $(test_epc_libs) +-tests_test_publisher_libsoup_494128_CFLAGS = $(example_epc_cflags) +-tests_test_publisher_libsoup_494128_LDADD = $(test_epc_libs) +-tests_test_publisher_unique_CFLAGS = $(example_epc_cflags) +-tests_test_publisher_unique_LDADD = $(test_epc_libs) +-tests_test_service_type_CFLAGS = $(example_epc_cflags) +-tests_test_service_type_LDADD = $(test_epc_libs) +- + # ================== + # -- CUSTOM RULES -- + # ================== Deleted: trunk/dports/gnome/libepc/files/patch-Makefile.in.diff =================================================================== --- trunk/dports/gnome/libepc/files/patch-Makefile.in.diff 2014-04-02 17:43:02 UTC (rev 118450) +++ trunk/dports/gnome/libepc/files/patch-Makefile.in.diff 2014-04-02 19:13:52 UTC (rev 118451) @@ -1,276 +0,0 @@ ---- Makefile.in.orig 2012-01-30 13:28:18.000000000 -0800 -+++ Makefile.in 2013-07-16 01:00:54.000000000 -0700 -@@ -42,28 +42,6 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --noinst_PROGRAMS = examples/list-resources$(EXEEXT) \ -- examples/lookup-resource$(EXEEXT) \ -- examples/service-browser$(EXEEXT) \ -- examples/simple-publisher$(EXEEXT) \ -- examples/consumer-ui$(EXEEXT) examples/publisher-ui$(EXEEXT) \ -- examples/server-credentials$(EXEEXT) $(am__EXEEXT_1) --TESTS = tests/test-consumer-by-info$(EXEEXT) \ -- tests/test-consumer-by-name$(EXEEXT) \ -- tests/test-dispatcher-local-collision$(EXEEXT) \ -- tests/test-dispatcher-multiple-services$(EXEEXT) \ -- tests/test-dispatcher-rename$(EXEEXT) \ -- tests/test-dispatcher-reset$(EXEEXT) \ -- tests/test-dispatcher-simple-service$(EXEEXT) \ -- tests/test-dispatcher-subtypes$(EXEEXT) \ -- tests/test-dispatcher-unique$(EXEEXT) \ -- tests/test-expand-name$(EXEEXT) \ -- tests/test-progress-hooks$(EXEEXT) \ -- tests/test-publisher-bookmarks$(EXEEXT) \ -- tests/test-publisher-change-name$(EXEEXT) \ -- tests/test-publisher-libsoup-494128$(EXEEXT) \ -- tests/test-publisher-unique$(EXEEXT) \ -- tests/test-service-type$(EXEEXT) - subdir = . - DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \ - $(dist_noinst_SCRIPTS) $(libepc_include_HEADERS) \ -@@ -144,220 +122,11 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libepc_libepc_1_0_la_CFLAGS) $(CFLAGS) \ - $(libepc_libepc_1_0_la_LDFLAGS) $(LDFLAGS) -o $@ --tests_libepc_tests_la_LIBADD = --am_tests_libepc_tests_la_OBJECTS = \ -- tests/tests_libepc_tests_la-framework.lo --tests_libepc_tests_la_OBJECTS = $(am_tests_libepc_tests_la_OBJECTS) --tests_libepc_tests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_libepc_tests_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --am__EXEEXT_1 = tests/test-consumer-by-info$(EXEEXT) \ -- tests/test-consumer-by-name$(EXEEXT) \ -- tests/test-dispatcher-local-collision$(EXEEXT) \ -- tests/test-dispatcher-multiple-services$(EXEEXT) \ -- tests/test-dispatcher-rename$(EXEEXT) \ -- tests/test-dispatcher-reset$(EXEEXT) \ -- tests/test-dispatcher-simple-service$(EXEEXT) \ -- tests/test-dispatcher-subtypes$(EXEEXT) \ -- tests/test-dispatcher-unique$(EXEEXT) \ -- tests/test-expand-name$(EXEEXT) \ -- tests/test-progress-hooks$(EXEEXT) \ -- tests/test-publisher-bookmarks$(EXEEXT) \ -- tests/test-publisher-change-name$(EXEEXT) \ -- tests/test-publisher-libsoup-494128$(EXEEXT) \ -- tests/test-publisher-unique$(EXEEXT) \ -- tests/test-service-type$(EXEEXT) - PROGRAMS = $(noinst_PROGRAMS) --examples_consumer_ui_SOURCES = examples/consumer-ui.c --examples_consumer_ui_OBJECTS = \ -- examples/examples_consumer_ui-consumer-ui.$(OBJEXT) - am__DEPENDENCIES_1 = - am__DEPENDENCIES_2 = libepc/libepc-1.0.la $(am__DEPENDENCIES_1) - am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) libepc-ui/libepc-ui-1.0.la \ - $(am__DEPENDENCIES_1) --examples_consumer_ui_DEPENDENCIES = $(am__DEPENDENCIES_3) \ -- $(am__DEPENDENCIES_1) --examples_consumer_ui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_consumer_ui_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_list_resources_SOURCES = examples/list-resources.c --examples_list_resources_OBJECTS = \ -- examples/examples_list_resources-list-resources.$(OBJEXT) --examples_list_resources_DEPENDENCIES = $(am__DEPENDENCIES_2) --examples_list_resources_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_list_resources_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_lookup_resource_SOURCES = examples/lookup-resource.c --examples_lookup_resource_OBJECTS = \ -- examples/examples_lookup_resource-lookup-resource.$(OBJEXT) --examples_lookup_resource_DEPENDENCIES = $(am__DEPENDENCIES_2) --examples_lookup_resource_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_lookup_resource_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_publisher_ui_SOURCES = examples/publisher-ui.c --examples_publisher_ui_OBJECTS = \ -- examples/examples_publisher_ui-publisher-ui.$(OBJEXT) --examples_publisher_ui_DEPENDENCIES = $(am__DEPENDENCIES_3) \ -- $(am__DEPENDENCIES_1) --examples_publisher_ui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_publisher_ui_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_server_credentials_SOURCES = examples/server-credentials.c --examples_server_credentials_OBJECTS = examples/examples_server_credentials-server-credentials.$(OBJEXT) --examples_server_credentials_DEPENDENCIES = $(am__DEPENDENCIES_3) --examples_server_credentials_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_server_credentials_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_service_browser_SOURCES = examples/service-browser.c --examples_service_browser_OBJECTS = \ -- examples/examples_service_browser-service-browser.$(OBJEXT) --examples_service_browser_DEPENDENCIES = $(am__DEPENDENCIES_2) --examples_service_browser_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_service_browser_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --examples_simple_publisher_SOURCES = examples/simple-publisher.c --examples_simple_publisher_OBJECTS = \ -- examples/examples_simple_publisher-simple-publisher.$(OBJEXT) --examples_simple_publisher_DEPENDENCIES = $(am__DEPENDENCIES_2) --examples_simple_publisher_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(examples_simple_publisher_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_consumer_by_info_SOURCES = tests/test-consumer-by-info.c --tests_test_consumer_by_info_OBJECTS = tests/tests_test_consumer_by_info-test-consumer-by-info.$(OBJEXT) --am__DEPENDENCIES_4 = tests/libepc-tests.la $(am__DEPENDENCIES_2) --tests_test_consumer_by_info_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_consumer_by_info_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_consumer_by_info_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_consumer_by_name_SOURCES = tests/test-consumer-by-name.c --tests_test_consumer_by_name_OBJECTS = tests/tests_test_consumer_by_name-test-consumer-by-name.$(OBJEXT) --tests_test_consumer_by_name_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_consumer_by_name_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_consumer_by_name_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_dispatcher_local_collision_SOURCES = \ -- tests/test-dispatcher-local-collision.c --tests_test_dispatcher_local_collision_OBJECTS = tests/tests_test_dispatcher_local_collision-test-dispatcher-local-collision.$(OBJEXT) --tests_test_dispatcher_local_collision_DEPENDENCIES = \ -- $(am__DEPENDENCIES_4) --tests_test_dispatcher_local_collision_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_local_collision_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_dispatcher_multiple_services_SOURCES = \ -- tests/test-dispatcher-multiple-services.c --tests_test_dispatcher_multiple_services_OBJECTS = tests/tests_test_dispatcher_multiple_services-test-dispatcher-multiple-services.$(OBJEXT) --tests_test_dispatcher_multiple_services_DEPENDENCIES = \ -- $(am__DEPENDENCIES_4) --tests_test_dispatcher_multiple_services_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_multiple_services_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_dispatcher_rename_SOURCES = tests/test-dispatcher-rename.c --tests_test_dispatcher_rename_OBJECTS = tests/tests_test_dispatcher_rename-test-dispatcher-rename.$(OBJEXT) --tests_test_dispatcher_rename_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_dispatcher_rename_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_rename_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_dispatcher_reset_SOURCES = tests/test-dispatcher-reset.c --tests_test_dispatcher_reset_OBJECTS = tests/tests_test_dispatcher_reset-test-dispatcher-reset.$(OBJEXT) --tests_test_dispatcher_reset_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_dispatcher_reset_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_reset_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_dispatcher_simple_service_SOURCES = \ -- tests/test-dispatcher-simple-service.c --tests_test_dispatcher_simple_service_OBJECTS = tests/tests_test_dispatcher_simple_service-test-dispatcher-simple-service.$(OBJEXT) --tests_test_dispatcher_simple_service_DEPENDENCIES = \ -- $(am__DEPENDENCIES_4) --tests_test_dispatcher_simple_service_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_simple_service_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_dispatcher_subtypes_SOURCES = \ -- tests/test-dispatcher-subtypes.c --tests_test_dispatcher_subtypes_OBJECTS = tests/tests_test_dispatcher_subtypes-test-dispatcher-subtypes.$(OBJEXT) --tests_test_dispatcher_subtypes_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_dispatcher_subtypes_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_subtypes_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_dispatcher_unique_SOURCES = tests/test-dispatcher-unique.c --tests_test_dispatcher_unique_OBJECTS = tests/tests_test_dispatcher_unique-test-dispatcher-unique.$(OBJEXT) --tests_test_dispatcher_unique_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_dispatcher_unique_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_dispatcher_unique_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_expand_name_SOURCES = tests/test-expand-name.c --tests_test_expand_name_OBJECTS = \ -- tests/tests_test_expand_name-test-expand-name.$(OBJEXT) --tests_test_expand_name_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_expand_name_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_expand_name_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_progress_hooks_SOURCES = tests/test-progress-hooks.c --tests_test_progress_hooks_OBJECTS = \ -- tests/tests_test_progress_hooks-test-progress-hooks.$(OBJEXT) --am__DEPENDENCIES_5 = tests/libepc-tests.la $(am__DEPENDENCIES_3) --tests_test_progress_hooks_DEPENDENCIES = $(am__DEPENDENCIES_5) --tests_test_progress_hooks_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_progress_hooks_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_publisher_bookmarks_SOURCES = \ -- tests/test-publisher-bookmarks.c --tests_test_publisher_bookmarks_OBJECTS = tests/tests_test_publisher_bookmarks-test-publisher-bookmarks.$(OBJEXT) --tests_test_publisher_bookmarks_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_publisher_bookmarks_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_publisher_bookmarks_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_publisher_change_name_SOURCES = \ -- tests/test-publisher-change-name.c --tests_test_publisher_change_name_OBJECTS = tests/tests_test_publisher_change_name-test-publisher-change-name.$(OBJEXT) --tests_test_publisher_change_name_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_publisher_change_name_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_publisher_change_name_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_publisher_libsoup_494128_SOURCES = \ -- tests/test-publisher-libsoup-494128.c --tests_test_publisher_libsoup_494128_OBJECTS = tests/tests_test_publisher_libsoup_494128-test-publisher-libsoup-494128.$(OBJEXT) --tests_test_publisher_libsoup_494128_DEPENDENCIES = \ -- $(am__DEPENDENCIES_4) --tests_test_publisher_libsoup_494128_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_publisher_libsoup_494128_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --tests_test_publisher_unique_SOURCES = tests/test-publisher-unique.c --tests_test_publisher_unique_OBJECTS = tests/tests_test_publisher_unique-test-publisher-unique.$(OBJEXT) --tests_test_publisher_unique_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_publisher_unique_LINK = $(LIBTOOL) --tag=CC \ -- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_publisher_unique_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --tests_test_service_type_SOURCES = tests/test-service-type.c --tests_test_service_type_OBJECTS = \ -- tests/tests_test_service_type-test-service-type.$(OBJEXT) --tests_test_service_type_DEPENDENCIES = $(am__DEPENDENCIES_4) --tests_test_service_type_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(tests_test_service_type_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ - SCRIPTS = $(dist_noinst_SCRIPTS) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -373,22 +142,7 @@ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(libepc_ui_libepc_ui_1_0_la_SOURCES) \ -- $(libepc_libepc_1_0_la_SOURCES) \ -- $(tests_libepc_tests_la_SOURCES) examples/consumer-ui.c \ -- examples/list-resources.c examples/lookup-resource.c \ -- examples/publisher-ui.c examples/server-credentials.c \ -- examples/service-browser.c examples/simple-publisher.c \ -- tests/test-consumer-by-info.c tests/test-consumer-by-name.c \ -- tests/test-dispatcher-local-collision.c \ -- tests/test-dispatcher-multiple-services.c \ -- tests/test-dispatcher-rename.c tests/test-dispatcher-reset.c \ -- tests/test-dispatcher-simple-service.c \ -- tests/test-dispatcher-subtypes.c \ -- tests/test-dispatcher-unique.c tests/test-expand-name.c \ -- tests/test-progress-hooks.c tests/test-publisher-bookmarks.c \ -- tests/test-publisher-change-name.c \ -- tests/test-publisher-libsoup-494128.c \ -- tests/test-publisher-unique.c tests/test-service-type.c -+ $(libepc_libepc_1_0_la_SOURCES) - DIST_SOURCES = $(libepc_ui_libepc_ui_1_0_la_SOURCES) \ - $(libepc_libepc_1_0_la_SOURCES) \ - $(tests_libepc_tests_la_SOURCES) examples/consumer-ui.c \ Added: trunk/dports/gnome/libepc/files/patch-configure.ac.diff =================================================================== --- trunk/dports/gnome/libepc/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/gnome/libepc/files/patch-configure.ac.diff 2014-04-02 19:13:52 UTC (rev 118451) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2014-03-28 11:04:37.000000000 -0700 ++++ configure.ac 2014-03-28 11:06:16.000000000 -0700 +@@ -77,7 +77,7 @@ + gmodule-2.0 >= 2.0 + gobject-2.0 >= 2.4 + gnutls >= 1.4 +- uuid >= 1.36 ++ uuid >= 1.6.2 + $LIBSOUP + $GIO]) + PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-3.0 >= 3.0]) Deleted: trunk/dports/gnome/libepc/files/patch-configure.diff =================================================================== --- trunk/dports/gnome/libepc/files/patch-configure.diff 2014-04-02 17:43:02 UTC (rev 118450) +++ trunk/dports/gnome/libepc/files/patch-configure.diff 2014-04-02 19:13:52 UTC (rev 118451) @@ -1,83 +0,0 @@ ---- configure.orig 2013-07-16 00:46:58.000000000 -0700 -+++ configure 2013-07-16 00:48:43.000000000 -0700 -@@ -14317,7 +14317,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - \$LIBSOUP - \$GIO\""; } >&5 - ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 -@@ -14327,7 +14327,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO") 2>&5 - ac_status=$? -@@ -14340,7 +14340,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO" 2>/dev/null` - else -@@ -14360,7 +14360,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - \$LIBSOUP - \$GIO\""; } >&5 - ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6 -@@ -14370,7 +14370,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO") 2>&5 - ac_status=$? -@@ -14383,7 +14383,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO" 2>/dev/null` - else -@@ -14412,7 +14412,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO" 2>&1` - else -@@ -14423,7 +14423,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO" 2>&1` - fi -@@ -14437,7 +14437,7 @@ - gmodule-2.0 >= 2.0 - gobject-2.0 >= 2.4 - gnutls >= 1.4 -- uuid >= 1.36 -+ uuid >= 1.6.2 - $LIBSOUP - $GIO) were not met: -