Revision: 104857 https://trac.macports.org/changeset/104857 Author: devans@macports.org Date: 2013-04-03 23:36:44 -0700 (Wed, 03 Apr 2013) Log Message: ----------- orbit2: remove use of -DG_DISABLE_DEPRECATED to allow build against current glib2. Modified Paths: -------------- trunk/dports/devel/orbit2/Portfile trunk/dports/devel/orbit2/files/patch-configure.diff Added Paths: ----------- trunk/dports/devel/orbit2/files/patch-linc2-src-Makefile.in.diff Modified: trunk/dports/devel/orbit2/Portfile =================================================================== --- trunk/dports/devel/orbit2/Portfile 2013-04-04 05:52:10 UTC (rev 104856) +++ trunk/dports/devel/orbit2/Portfile 2013-04-04 06:36:44 UTC (rev 104857) @@ -7,7 +7,7 @@ name orbit2 set my_name ORBit2 version 2.14.19 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] maintainers nomaintainer categories devel gnome @@ -35,6 +35,9 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:libidl +patchfiles patch-configure.diff \ + patch-linc2-src-Makefile.in.diff + # This file doesn't merge right for 3-way universal set merger_dont_diff "${prefix}/include/orbit-2.0/orbit/orbit-config.h" @@ -62,7 +65,7 @@ } # During configure phase, idl compiler on run_arch will not exist yet, so disable the check for existence. - patchfiles-append patch-configure.diff + # patchfiles-append patch-configure.diff foreach arch ${cross_archs} { lappend merger_configure_args(${arch}) \ Modified: trunk/dports/devel/orbit2/files/patch-configure.diff =================================================================== --- trunk/dports/devel/orbit2/files/patch-configure.diff 2013-04-04 05:52:10 UTC (rev 104856) +++ trunk/dports/devel/orbit2/files/patch-configure.diff 2013-04-04 06:36:44 UTC (rev 104857) @@ -1,8 +1,8 @@ ---- configure.orig 2009-03-05 04:53:02.000000000 -0700 -+++ configure 2009-04-27 09:46:38.000000000 -0700 -@@ -11662,9 +11662,9 @@ +--- configure.orig 2010-09-28 02:39:37.000000000 -0700 ++++ configure 2013-04-03 23:01:24.000000000 -0700 +@@ -11034,9 +11034,9 @@ # Check whether --with-idl-compiler was given. - if test "${with_idl_compiler+set}" = set; then + if test "${with_idl_compiler+set}" = set; then : withval=$with_idl_compiler; if test "x$withval" != x; then - if test -f "$withval"; then + #if test -f "$withval"; then @@ -12,3 +12,12 @@ fi fi +@@ -12950,7 +12950,7 @@ + + if test "$enable_maintainer_mode" = "yes"; then + DISABLE_DEPRECATED_CFLAGS=" \ +- -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" ++ -DG_DISABLE_SINGLE_INCLUDES" + + fi + Added: trunk/dports/devel/orbit2/files/patch-linc2-src-Makefile.in.diff =================================================================== --- trunk/dports/devel/orbit2/files/patch-linc2-src-Makefile.in.diff (rev 0) +++ trunk/dports/devel/orbit2/files/patch-linc2-src-Makefile.in.diff 2013-04-04 06:36:44 UTC (rev 104857) @@ -0,0 +1,11 @@ +--- linc2/src/Makefile.in.orig 2013-04-03 22:57:42.000000000 -0700 ++++ linc2/src/Makefile.in 2013-04-03 22:58:39.000000000 -0700 +@@ -244,7 +244,7 @@ + # -I$(top_srcdir)/include + INCLUDES = -I$(top_builddir)/linc2/include \ + -I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \ +- -DG_DISABLE_DEPRECATED $(am__append_1) ++ $(am__append_1) + liblinc_la_SOURCES = \ + linc.c \ + linc-connection.c \