diff options
| -rw-r--r-- | devel/dbus/Makefile | 19 | ||||
| -rw-r--r-- | devel/dbus/files/dbus.in | 5 | ||||
| -rw-r--r-- | devel/dbus/files/dbus.sh | 5 | ||||
| -rw-r--r-- | devel/dbus/files/patch-configure | 27 | ||||
| -rw-r--r-- | devel/dbus/files/patch-python_Makefile.in | 21 | ||||
| -rw-r--r-- | devel/dbus/files/patch-python_dbus_bindings.pyx.in | 14 |
6 files changed, 76 insertions, 15 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index d60f0b38dde0..5d80cbbb76f9 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -7,22 +7,21 @@ PORTNAME= dbus PORTVERSION= 0.21 -PORTREVISION= 1 -CATEGORIES= devel gnome +PORTREVISION= 2 +CATEGORIES?= devel gnome MASTER_SITES= http://freedesktop.org/Software/dbus/releases/ -MAINTAINER= gnome@FreeBSD.org -COMMENT= A message bus system for inter-application communication +MAINTAINER?= gnome@FreeBSD.org +COMMENT?= A message bus system for inter-application communication -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS?= expat.5:${PORTSDIR}/textproc/expat2 -USE_GNOME= gnomehack gtk20 libxml2 +USE_GNOME?= gnomehack gtk20 libxml2 USE_GMAKE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_RC_SUBR= yes -USE_PYTHON= yes -CONFIGURE_ARGS= --enable-gtk \ +CONFIGURE_ARGS?=--enable-gtk \ --disable-python \ --disable-gcj \ --disable-mono \ @@ -34,6 +33,7 @@ CONFIGURE_ARGS= --enable-gtk \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.if !defined(DBUS_SLAVE) OPTIONS= QT "Enable Qt client support" off PLIST_SUB= VERSION="1.0" @@ -41,9 +41,11 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAN1= dbus-cleanup-sockets.1 dbus-daemon-1.1 dbus-launch.1 \ dbus-monitor.1 dbus-send.1 +.endif .include <bsd.port.pre.mk> +.if !defined(DBUS_SLAVE) .if defined(WITH_QT) && !defined(WITHOUT_QT) CONFIGURE_ARGS+=--enable-qt PLIST_SUB+= QT="" @@ -61,5 +63,6 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${INSTALL_SCRIPT} ${WRKSRC}/dbus.sh ${PREFIX}/etc/rc.d +.endif .include <bsd.port.post.mk> diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in index b65a2106285d..9717b6a05da9 100644 --- a/devel/dbus/files/dbus.in +++ b/devel/dbus/files/dbus.in @@ -11,6 +11,9 @@ # dbus_enable="YES" # +dbus_enable=${dbus_enable-"NO"} +dbus_flags=${dbus_flags-"--system"} + . %%RC_SUBR%% name=dbus @@ -26,8 +29,6 @@ stop_postcmd() rm -f $pidfile } -[ -z "$dbus_enable" ] && dbus_enable="NO" -[ -z "$dbus_flags" ] && dbus_flags="--system" load_rc_config ${name} run_rc_command "$1" diff --git a/devel/dbus/files/dbus.sh b/devel/dbus/files/dbus.sh index b65a2106285d..9717b6a05da9 100644 --- a/devel/dbus/files/dbus.sh +++ b/devel/dbus/files/dbus.sh @@ -11,6 +11,9 @@ # dbus_enable="YES" # +dbus_enable=${dbus_enable-"NO"} +dbus_flags=${dbus_flags-"--system"} + . %%RC_SUBR%% name=dbus @@ -26,8 +29,6 @@ stop_postcmd() rm -f $pidfile } -[ -z "$dbus_enable" ] && dbus_enable="NO" -[ -z "$dbus_flags" ] && dbus_flags="--system" load_rc_config ${name} run_rc_command "$1" diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure index 67be44b5b33b..0e4169c27367 100644 --- a/devel/dbus/files/patch-configure +++ b/devel/dbus/files/patch-configure @@ -1,6 +1,27 @@ ---- configure.orig Thu Jul 22 01:12:36 2004 -+++ configure Thu Jul 22 01:13:22 2004 -@@ -24198,14 +24198,14 @@ +--- configure.orig Sun Jul 25 03:43:08 2004 ++++ configure Sun Jul 25 03:54:07 2004 +@@ -23359,17 +23359,15 @@ + if test x$have_abstract_sockets = xyes ; then + abstract_sockets=1 + DBUS_PATH_OR_ABSTRACT=abstract ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_ABSTRACT_SOCKETS $abstract_sockets ++_ACEOF + else + abstract_sockets=0 + DBUS_PATH_OR_ABSTRACT=path + fi + + +-cat >>confdefs.h <<_ACEOF +-#define HAVE_ABSTRACT_SOCKETS $abstract_sockets +-_ACEOF +- +- + # this is used in addresses to prefer abstract, e.g. + # unix:path=/foo or unix:abstract=/foo + +@@ -24198,14 +24196,14 @@ echo "${ECHO_T}not found" >&6 fi diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in new file mode 100644 index 000000000000..7f0b73baeec3 --- /dev/null +++ b/devel/dbus/files/patch-python_Makefile.in @@ -0,0 +1,21 @@ +--- python/Makefile.in.orig Sun Jul 25 03:19:00 2004 ++++ python/Makefile.in Sun Jul 25 03:19:40 2004 +@@ -237,7 +237,7 @@ + dbusbindings_LTLIBRARIES = dbus_bindings.la + + dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings +-dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la ++dbus_bindings_la_LIBADD = + nodist_dbus_bindings_la_SOURCES = dbus_bindings.c + + EXTRA_DIST = \ +@@ -257,8 +257,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(dbusbindings_LTLIBRARIES) + +-dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la \ +- $(top_builddir)/glib/libdbus-glib-1.la ++dbus_bindings_la_DEPENDENCIES = + nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo + dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS) + diff --git a/devel/dbus/files/patch-python_dbus_bindings.pyx.in b/devel/dbus/files/patch-python_dbus_bindings.pyx.in new file mode 100644 index 000000000000..821eb96d3698 --- /dev/null +++ b/devel/dbus/files/patch-python_dbus_bindings.pyx.in @@ -0,0 +1,14 @@ +--- python/dbus_bindings.pyx.in.orig Tue Oct 28 19:06:07 2003 ++++ python/dbus_bindings.pyx.in Sun Jul 25 03:17:42 2004 +@@ -1,5 +1,11 @@ + # -*- Mode: Python -*- + ++cdef extern from "sys/types.h": ++ ctypedef size_t ++ ++cdef extern from "sys/cdefs.h": ++ ctypedef __signed ++ + #include "dbus_h_wrapper.h" + + cdef extern from "stdlib.h": |