aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2007-10-25 07:37:25 +0800
committermarcus <marcus@FreeBSD.org>2007-10-25 07:37:25 +0800
commit43bd9f14d9ce11690e9538bf3b03d3462faa6dbe (patch)
treeda347910089a96d6d726b8bb080f62c773263828 /net
parent2e669ed08a56339ee1a8b2a0573a30147f95bd82 (diff)
downloadfreebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.gz
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.zst
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.zip
Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338
Diffstat (limited to 'net')
-rw-r--r--net/Makefile5
-rw-r--r--net/avahi-app/Makefile135
-rw-r--r--net/avahi-app/distinfo (renamed from net/avahi/distinfo)0
-rw-r--r--net/avahi-app/files/patch-Makefile.in (renamed from net/avahi/files/patch-Makefile.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-client.pc.in (renamed from net/avahi/files/patch-avahi-client.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c (renamed from net/avahi/files/patch-avahi-common_dbus-watch-glue.c)0
-rw-r--r--net/avahi-app/files/patch-avahi-compat-howl.pc.in (renamed from net/avahi/files/patch-avahi-compat-howl.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in (renamed from net/avahi/files/patch-avahi-compat-libdns_sd.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in58
-rw-r--r--net/avahi-app/files/patch-avahi-core.pc.in (renamed from net/avahi/files/patch-avahi-core.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-daemon_main.c (renamed from net/avahi/files/patch-avahi-daemon_main.c)0
-rw-r--r--net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in24
-rw-r--r--net/avahi-app/files/patch-avahi-glib.pc.in (renamed from net/avahi/files/patch-avahi-glib.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-qt3.pc.in (renamed from net/avahi/files/patch-avahi-qt3.pc.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-qt_Makefile.in (renamed from net/avahi/files/patch-avahi-qt_Makefile.in)0
-rw-r--r--net/avahi-app/files/patch-avahi-ui_Makefile.in40
-rw-r--r--net/avahi-app/files/patch-configure (renamed from net/avahi/files/patch-configure)0
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in (renamed from net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in)0
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in (renamed from net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in)0
-rw-r--r--net/avahi-app/files/patch-man_Makefile.in (renamed from net/avahi/files/patch-man_Makefile.in)0
-rw-r--r--net/avahi-app/pkg-descr7
-rw-r--r--net/avahi-app/pkg-install (renamed from net/avahi/pkg-install)0
-rw-r--r--net/avahi-app/pkg-plist (renamed from net/avahi/pkg-plist)21
-rw-r--r--net/avahi-autoipd/Makefile29
-rw-r--r--net/avahi-autoipd/pkg-descr3
-rw-r--r--net/avahi-autoipd/pkg-install36
-rw-r--r--net/avahi-autoipd/pkg-plist3
-rw-r--r--net/avahi-gtk/Makefile38
-rw-r--r--net/avahi-gtk/pkg-descr3
-rw-r--r--net/avahi-gtk/pkg-plist16
-rw-r--r--net/avahi-libdns/Makefile26
-rw-r--r--net/avahi-libdns/pkg-descr3
-rw-r--r--net/avahi-libdns/pkg-install36
-rw-r--r--net/avahi-libdns/pkg-plist7
-rw-r--r--net/avahi-qt3/Makefile28
-rw-r--r--net/avahi-sharp/Makefile26
-rw-r--r--net/avahi/Makefile110
-rw-r--r--net/blam/Makefile5
-rw-r--r--net/blam/files/extra-libblam_blam-gecko-utils.cpp0
-rw-r--r--net/blam/pkg-plist63
-rw-r--r--net/crescendo/Makefile12
-rw-r--r--net/crescendo/pkg-plist10
-rw-r--r--net/diradmin/Makefile2
-rw-r--r--net/diradmin/files/patch-configure9
-rw-r--r--net/diradmin/pkg-plist40
-rw-r--r--net/ekiga/Makefile7
-rw-r--r--net/ekiga/pkg-plist79
-rw-r--r--net/evolution-rss/Makefile33
-rw-r--r--net/evolution-rss/distinfo3
-rw-r--r--net/evolution-rss/pkg-descr3
-rw-r--r--net/evolution-rss/pkg-plist10
-rw-r--r--net/g2ipmsg/Makefile2
-rw-r--r--net/g2ipmsg/pkg-plist17
-rw-r--r--net/gnoemoe/Makefile2
-rw-r--r--net/gnoemoe/files/patch-Makefile.in11
-rw-r--r--net/gnoemoe/files/patch-po-Makefile.in.in11
-rw-r--r--net/gnoemoe/pkg-plist91
-rw-r--r--net/gnome-mud/Makefile2
-rw-r--r--net/gnome-mud/pkg-plist23
-rw-r--r--net/gnome-netstatus/Makefile7
-rw-r--r--net/gnome-netstatus/pkg-plist42
-rw-r--r--net/gnome-nettool/Makefile11
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/pkg-plist77
-rw-r--r--net/gnometelnet/Makefile10
-rw-r--r--net/gnometelnet/pkg-plist8
-rw-r--r--net/grdesktop/Makefile4
-rw-r--r--net/grdesktop/pkg-plist49
-rw-r--r--net/liferea/Makefile3
-rw-r--r--net/liferea/pkg-plist247
-rw-r--r--net/link-monitor-applet/Makefile2
-rw-r--r--net/link-monitor-applet/pkg-plist430
-rw-r--r--net/linphone-base/Makefile10
-rw-r--r--net/linphone-base/pkg-plist.gui30
-rw-r--r--net/linux-nx-client/Makefile6
-rw-r--r--net/linux-nx-client/pkg-plist10
-rw-r--r--net/mugshot/Makefile1
-rw-r--r--net/mugshot/pkg-plist21
-rw-r--r--net/netspeed_applet/Makefile4
-rw-r--r--net/netspeed_applet/pkg-plist22
-rw-r--r--net/py-avahi/Makefile26
-rw-r--r--net/service-discovery-applet/Makefile6
-rw-r--r--net/service-discovery-applet/pkg-plist56
-rw-r--r--net/straw/Makefile7
-rw-r--r--net/straw/files/patch-constants.py.in11
-rw-r--r--net/straw/files/patch-setup.py9
-rw-r--r--net/straw/files/patch-src::straw9
-rw-r--r--net/straw/pkg-plist281
-rw-r--r--net/tsclient/Makefile6
-rw-r--r--net/tsclient/pkg-plist53
-rw-r--r--net/vino/Makefile14
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/pkg-plist15
93 files changed, 1475 insertions, 1113 deletions
diff --git a/net/Makefile b/net/Makefile
index 3780109e23fd..d58317957fa2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -39,6 +39,10 @@
SUBDIR += astfax
SUBDIR += atmsupport
SUBDIR += avahi
+ SUBDIR += avahi-app
+ SUBDIR += avahi-autoipd
+ SUBDIR += avahi-gtk
+ SUBDIR += avahi-libdns
SUBDIR += avahi-qt3
SUBDIR += avahi-sharp
SUBDIR += b2bua
@@ -122,6 +126,7 @@
SUBDIR += etherboot
SUBDIR += etrace
SUBDIR += etunnel
+ SUBDIR += evolution-rss
SUBDIR += findmtu
SUBDIR += flowgrep
SUBDIR += forg
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
new file mode 100644
index 000000000000..d647f23e70ad
--- /dev/null
+++ b/net/avahi-app/Makefile
@@ -0,0 +1,135 @@
+# New ports collection makefile for: avahi
+# Date created: 18 November 2005
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net/avahi-app/Makefile,v 1.6 2007/08/26 06:10:14 marcus Exp $
+#
+
+PORTNAME= avahi
+PORTVERSION= 0.6.21
+PORTREVISION?= 1
+CATEGORIES?= net dns
+MASTER_SITES= http://www.avahi.org/download/
+PKGNAMESUFFIX?= -app
+
+MAINTAINER?= gnome@FreeBSD.org
+COMMENT?= Service discovery on a local network
+
+LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
+ daemon.0:${PORTSDIR}/devel/libdaemon \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ gdbm.3:${PORTSDIR}/databases/gdbm
+
+USE_GNOME?= gnomehack ltverhack glib20
+USE_GNOME_SUBR= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
+AVAHI_SLAVE?= no
+CONFIGURE_ARGS?=--with-distro=freebsd \
+ --with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
+ --disable-monodoc \
+ --disable-doxygen-doc \
+ --disable-doxygen-dot \
+ --localstatedir=/var \
+ --enable-compat-howl
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.if ${AVAHI_SLAVE}=="no"
+CONFLICTS= howl-[0-9]*
+
+MAN1= avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1
+MAN5= avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5
+MAN8= avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
+
+MLINKS= avahi-browse.1 avahi-browse-domains.1 \
+ avahi-publish.1 avahi-publish-address.1 \
+ avahi-publish.1 avahi-publish-service.1 \
+ avahi-resolve.1 avahi-resolve-address.1 \
+ avahi-resolve.1 avahi-resolve-host-name.1
+.endif
+
+USE_RC_SUBR=yes
+
+.include <bsd.port.pre.mk>
+
+.if ${AVAHI_SLAVE}=="autoipd"
+CONFIGURE_ARGS+=--enable-autoipd
+.else
+CONFIGURE_ARGS+=--disable-autoipd
+.endif
+.if ${AVAHI_SLAVE}=="gtk"
+CONFIGURE_ARGS+=--enable-gtk
+.else
+CONFIGURE_ARGS+=--disable-gtk
+.endif
+.if ${AVAHI_SLAVE}=="libdns"
+CONFIGURE_ARGS+=--enable-compat-libdns_sd
+.else
+CONFIGURE_ARGS+=--disable-compat-libdns_sd
+.endif
+.if ${AVAHI_SLAVE}=="python"
+CONFIGURE_ARGS+=--enable-python
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+.if ${AVAHI_SLAVE}=="qt3"
+CONFIGURE_ARGS+=--enable-qt3
+.else
+CONFIGURE_ARGS+=--disable-qt3
+.endif
+.if ${AVAHI_SLAVE}=="qt4"
+CONFIGURE_ARGS+=--enable-qt4
+.else
+CONFIGURE_ARGS+=--disable-qt4
+.endif
+.if ${AVAHI_SLAVE}=="sharp"
+CONFIGURE_ARGS+=--enable-mono
+.else
+CONFIGURE_ARGS+=--disable-mono
+.endif
+
+post-patch: avahi-post-patch
+
+avahi-post-patch:
+ @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
+ ${WRKSRC}/man/*.*
+ @${RM} -f ${WRKSRC}/man/*.bak
+ @${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/avahi-client/Makefile.in \
+ ${WRKSRC}/avahi-daemon/Makefile.in
+ @${REINPLACE_CMD} -e 's|%%RC_SUBR%%|${RC_SUBR}| ; \
+ s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
+ ${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
+ ${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
+
+post-build: avahi-post-build
+
+avahi-post-build:
+.for f in ${AVAHI_PKGCONFIG}
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
+.endfor
+
+post-install: avahi-post-install
+
+avahi-post-install:
+.if ${AVAHI_SLAVE}!="no"
+.for f in ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9}
+ ${INSTALL_DATA} ${WRKSRC}/man/${f} ${PREFIX}/man/man${f:E}/${f}
+.endfor
+.endif
+.for f in ${AVAHI_PKGCONFIG}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/libdata/pkgconfig
+.endfor
+.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/avahi/distinfo b/net/avahi-app/distinfo
index 2600f64c27fe..2600f64c27fe 100644
--- a/net/avahi/distinfo
+++ b/net/avahi-app/distinfo
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi-app/files/patch-Makefile.in
index 9c28621038bd..9c28621038bd 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi-app/files/patch-Makefile.in
diff --git a/net/avahi/files/patch-avahi-client.pc.in b/net/avahi-app/files/patch-avahi-client.pc.in
index e980e52e0fe2..e980e52e0fe2 100644
--- a/net/avahi/files/patch-avahi-client.pc.in
+++ b/net/avahi-app/files/patch-avahi-client.pc.in
diff --git a/net/avahi/files/patch-avahi-common_dbus-watch-glue.c b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
index 1e148af8564c..1e148af8564c 100644
--- a/net/avahi/files/patch-avahi-common_dbus-watch-glue.c
+++ b/net/avahi-app/files/patch-avahi-common_dbus-watch-glue.c
diff --git a/net/avahi/files/patch-avahi-compat-howl.pc.in b/net/avahi-app/files/patch-avahi-compat-howl.pc.in
index f101cc1da5e3..f101cc1da5e3 100644
--- a/net/avahi/files/patch-avahi-compat-howl.pc.in
+++ b/net/avahi-app/files/patch-avahi-compat-howl.pc.in
diff --git a/net/avahi/files/patch-avahi-compat-libdns_sd.pc.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
index 8487c1b5a298..8487c1b5a298 100644
--- a/net/avahi/files/patch-avahi-compat-libdns_sd.pc.in
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd.pc.in
diff --git a/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
new file mode 100644
index 000000000000..f111db2ab974
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-compat-libdns_sd_Makefile.in
@@ -0,0 +1,58 @@
+--- avahi-compat-libdns_sd/Makefile.in.orig 2007-07-31 12:31:07.000000000 -0400
++++ avahi-compat-libdns_sd/Makefile.in 2007-07-31 12:35:41.000000000 -0400
+@@ -101,17 +101,14 @@
+ null_test_OBJECTS = $(am_null_test_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
+ am__txt_test_SOURCES_DIST = dns_sd.h txt.c txt-test.c warn.c warn.h
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am_txt_test_OBJECTS = txt_test-txt.$(OBJEXT) \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-txt-test.$(OBJEXT) \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-warn.$(OBJEXT)
+ txt_test_OBJECTS = $(am_txt_test_OBJECTS)
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -430,7 +427,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt.c \
+@@ -438,7 +435,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ compat.c \
+@@ -446,7 +443,7 @@
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
+ all: all-am
+
+@@ -883,7 +880,7 @@
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
+-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/avahi/files/patch-avahi-core.pc.in b/net/avahi-app/files/patch-avahi-core.pc.in
index fdde41be9c53..fdde41be9c53 100644
--- a/net/avahi/files/patch-avahi-core.pc.in
+++ b/net/avahi-app/files/patch-avahi-core.pc.in
diff --git a/net/avahi/files/patch-avahi-daemon_main.c b/net/avahi-app/files/patch-avahi-daemon_main.c
index c95ab399fe7e..c95ab399fe7e 100644
--- a/net/avahi/files/patch-avahi-daemon_main.c
+++ b/net/avahi-app/files/patch-avahi-daemon_main.c
diff --git a/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
new file mode 100644
index 000000000000..70562fd5aa4e
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-discover-standalone_Makefile.in
@@ -0,0 +1,24 @@
+--- avahi-discover-standalone/Makefile.in.orig Tue Jul 31 11:41:28 2007
++++ avahi-discover-standalone/Makefile.in Tue Jul 31 11:43:05 2007
+@@ -79,9 +79,6 @@
+ $(am_avahi_discover_standalone_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES = \
+-@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
+ @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ @HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -406,10 +403,7 @@
+ @HAVE_GTK_TRUE@ -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
+
+ @HAVE_GTK_TRUE@avahi_discover_standalone_LDADD = \
+-@HAVE_GTK_TRUE@ $(AM_LDADD) \
+-@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
++@HAVE_GTK_TRUE@ $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_GTK_TRUE@ $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
+
+ @HAVE_GTK_FALSE@@HAVE_PYTHON_DBUS_TRUE@interfaces_DATA = $(interfaces)
diff --git a/net/avahi/files/patch-avahi-glib.pc.in b/net/avahi-app/files/patch-avahi-glib.pc.in
index e2633c32db44..e2633c32db44 100644
--- a/net/avahi/files/patch-avahi-glib.pc.in
+++ b/net/avahi-app/files/patch-avahi-glib.pc.in
diff --git a/net/avahi/files/patch-avahi-qt3.pc.in b/net/avahi-app/files/patch-avahi-qt3.pc.in
index 8174f25846d8..8174f25846d8 100644
--- a/net/avahi/files/patch-avahi-qt3.pc.in
+++ b/net/avahi-app/files/patch-avahi-qt3.pc.in
diff --git a/net/avahi/files/patch-avahi-qt_Makefile.in b/net/avahi-app/files/patch-avahi-qt_Makefile.in
index 5788e2399dd5..5788e2399dd5 100644
--- a/net/avahi/files/patch-avahi-qt_Makefile.in
+++ b/net/avahi-app/files/patch-avahi-qt_Makefile.in
diff --git a/net/avahi-app/files/patch-avahi-ui_Makefile.in b/net/avahi-app/files/patch-avahi-ui_Makefile.in
new file mode 100644
index 000000000000..531e506687df
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-ui_Makefile.in
@@ -0,0 +1,40 @@
+--- avahi-ui/Makefile.in.orig Tue Jul 31 11:49:11 2007
++++ avahi-ui/Makefile.in Tue Jul 31 11:50:37 2007
+@@ -89,9 +89,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
+ am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
+@@ -112,8 +110,6 @@
+ bssh_OBJECTS = $(am_bssh_OBJECTS)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES = \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ libavahi-ui.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -439,15 +435,12 @@
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_CFLAGS = $(AM_CFLAGS) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(GTK20_CFLAGS) $(am__append_2) \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(am__append_5)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = $(AM_LDADD) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core avahi-glib` \
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(GTK20_LIBS) $(am__append_3)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_UI_VERSION_INFO)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) `$(PKG_CONFIG) --cflags --libs avahi-client avahi-core` libavahi-ui.la
+ CLEANFILES = $(desktop_DATA)
+ all: all-am
+
diff --git a/net/avahi/files/patch-configure b/net/avahi-app/files/patch-configure
index 141c9403f76b..141c9403f76b 100644
--- a/net/avahi/files/patch-configure
+++ b/net/avahi-app/files/patch-configure
diff --git a/net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
index 564577bf0b9e..564577bf0b9e 100644
--- a/net/avahi/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
diff --git a/net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
index 1e7939466c58..1e7939466c58 100644
--- a/net/avahi/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
diff --git a/net/avahi/files/patch-man_Makefile.in b/net/avahi-app/files/patch-man_Makefile.in
index b46557af681a..b46557af681a 100644
--- a/net/avahi/files/patch-man_Makefile.in
+++ b/net/avahi-app/files/patch-man_Makefile.in
diff --git a/net/avahi-app/pkg-descr b/net/avahi-app/pkg-descr
new file mode 100644
index 000000000000..fb85b6205ba1
--- /dev/null
+++ b/net/avahi-app/pkg-descr
@@ -0,0 +1,7 @@
+Service discovery on a local network -- this means that you can plug your
+laptop or computer into a network and instantly be able to view other people
+who you can chat with, find printers to print to or find files being shared.
+This kind of technology is already found in MacOS X (branded 'Rendezvous',
+'Bonjour' and sometimes 'ZeroConf') and is very convenient.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi/pkg-install b/net/avahi-app/pkg-install
index 9bbd14bce237..9bbd14bce237 100644
--- a/net/avahi/pkg-install
+++ b/net/avahi-app/pkg-install
diff --git a/net/avahi/pkg-plist b/net/avahi-app/pkg-plist
index 25d108d0a72a..04bf17bfdfa7 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -1,6 +1,5 @@
bin/avahi-browse
bin/avahi-browse-domains
-%%GTK%%bin/avahi-discover-standalone
bin/avahi-publish
bin/avahi-publish-address
bin/avahi-publish-service
@@ -8,8 +7,6 @@ bin/avahi-resolve
bin/avahi-resolve-address
bin/avahi-resolve-host-name
bin/avahi-set-host-name
-%%GTK%%bin/bssh
-%%GTK%%bin/bvnc
etc/avahi/avahi-daemon.conf
etc/avahi/avahi-dnsconfd.action
etc/avahi/hosts
@@ -55,7 +52,6 @@ include/avahi-compat-howl/salt/salt.h
include/avahi-compat-howl/salt/signal.h
include/avahi-compat-howl/salt/socket.h
include/avahi-compat-howl/salt/time.h
-%%LIBDNS%%include/avahi-compat-libdns_sd/dns_sd.h
include/avahi-core/core.h
include/avahi-core/log.h
include/avahi-core/lookup.h
@@ -63,7 +59,6 @@ include/avahi-core/publish.h
include/avahi-core/rr.h
include/avahi-glib/glib-malloc.h
include/avahi-glib/glib-watch.h
-%%GTK%%include/avahi-ui/avahi-ui.h
lib/libavahi-client.a
lib/libavahi-client.la
lib/libavahi-client.so
@@ -80,30 +75,17 @@ lib/libavahi-glib.a
lib/libavahi-glib.la
lib/libavahi-glib.so
lib/libavahi-glib.so.1
-%%GTK%%lib/libavahi-ui.a
-%%GTK%%lib/libavahi-ui.la
-%%GTK%%lib/libavahi-ui.so
-%%GTK%%lib/libavahi-ui.so.0
-%%LIBDNS%%lib/libdns_sd.a
-%%LIBDNS%%lib/libdns_sd.la
-%%LIBDNS%%lib/libdns_sd.so
-%%LIBDNS%%lib/libdns_sd.so.1
lib/libhowl.a
lib/libhowl.la
lib/libhowl.so
lib/libhowl.so.0
libdata/pkgconfig/avahi-client.pc
libdata/pkgconfig/avahi-compat-howl.pc
-%%LIBDNS%%libdata/pkgconfig/avahi-compat-libdns_sd.pc
libdata/pkgconfig/avahi-core.pc
libdata/pkgconfig/avahi-glib.pc
-%%GTK%%libdata/pkgconfig/avahi-ui.pc
sbin/avahi-daemon
sbin/avahi-dnsconfd
-%%GTK%%share/applications/bssh.desktop
-%%GTK%%share/applications/bvnc.desktop
%%DATADIR%%/avahi-service.dtd
-%%GTK%%%%DATADIR%%/interfaces/avahi-discover.glade
%%DATADIR%%/introspection/AddressResolver.introspect
%%DATADIR%%/introspection/DomainBrowser.introspect
%%DATADIR%%/introspection/EntryGroup.introspect
@@ -115,13 +97,10 @@ sbin/avahi-dnsconfd
%%DATADIR%%/introspection/ServiceTypeBrowser.introspect
%%DATADIR%%/service-types
@dirrm %%DATADIR%%/introspection
-%%GTK%%@dirrm %%DATADIR%%/interfaces
@dirrm %%DATADIR%%
@dirrmtry share/applications
-%%GTK%%@dirrm include/avahi-ui
@dirrm include/avahi-glib
@dirrm include/avahi-core
-%%LIBDNS%%@dirrm include/avahi-compat-libdns_sd
@dirrm include/avahi-compat-howl/salt
@dirrm include/avahi-compat-howl/rendezvous
@dirrm include/avahi-compat-howl/discovery
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
new file mode 100644
index 000000000000..32c5540a98b4
--- /dev/null
+++ b/net/avahi-autoipd/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: avahi-autoipd
+# Date created: 31 July 2007
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net/avahi-autoipd/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= net
+PKGNAMESUFFIX= -autoipd
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= IPv4LL network address configuration daemon
+
+LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR= ${.CURDIR}/../avahi-app
+BUILD_WRKSRC= ${WRKSRC}/avahi-autoipd
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE= autoipd
+
+MAN8= avahi-autoipd.8
+USE_GNOME= gnomehack gnometarget ltverhack
+PKGINSTALL= ${.CURDIR}/pkg-install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-autoipd/pkg-descr b/net/avahi-autoipd/pkg-descr
new file mode 100644
index 000000000000..6bd36b16a559
--- /dev/null
+++ b/net/avahi-autoipd/pkg-descr
@@ -0,0 +1,3 @@
+IPv4LL network address configuration daemon
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-autoipd/pkg-install b/net/avahi-autoipd/pkg-install
new file mode 100644
index 000000000000..c4ce455d28a4
--- /dev/null
+++ b/net/avahi-autoipd/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ USER=avahi-autoipd
+ GROUP=${USER}
+ UID=546
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "Avahi Autoipd Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+ exit 0
+ ;;
+esac
diff --git a/net/avahi-autoipd/pkg-plist b/net/avahi-autoipd/pkg-plist
new file mode 100644
index 000000000000..1b558b08b699
--- /dev/null
+++ b/net/avahi-autoipd/pkg-plist
@@ -0,0 +1,3 @@
+etc/avahi/avahi-autoipd.action
+sbin/avahi-autoipd
+@dirrm etc/avahi
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
new file mode 100644
index 000000000000..e98f44128756
--- /dev/null
+++ b/net/avahi-gtk/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: avahi-gtk
+# Date created: 31 July 2007
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net/avahi-gtk/Makefile,v 1.2 2007/09/12 12:41:45 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= net
+PKGNAMESUFFIX= -gtk
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk+ tools and bindings to the Avahi mDNS system
+
+LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR= ${.CURDIR}/../avahi-app
+BUILD_WRKSRC= ${WRKSRC}/avahi-ui
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE= gtk
+AVAHI_PKGCONFIG=avahi-ui.pc
+
+MAN1+= bssh.1
+MLINKS+= bssh.1 bvnc.1
+USE_GNOME= gnomehack gnometarget ltverhack libglade2
+
+post-build:
+ @(cd ${WRKSRC}/avahi-discover-standalone; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+ @(cd ${WRKSRC}/avahi-discover-standalone; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/pkg-descr b/net/avahi-gtk/pkg-descr
new file mode 100644
index 000000000000..a1980414528b
--- /dev/null
+++ b/net/avahi-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Gtk+ tools and bindings to the avahi mDNS service discovery system.
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-gtk/pkg-plist b/net/avahi-gtk/pkg-plist
new file mode 100644
index 000000000000..59f4cfe2b5ca
--- /dev/null
+++ b/net/avahi-gtk/pkg-plist
@@ -0,0 +1,16 @@
+bin/avahi-discover-standalone
+bin/bssh
+bin/bvnc
+include/avahi-ui/avahi-ui.h
+lib/libavahi-ui.a
+lib/libavahi-ui.la
+lib/libavahi-ui.so
+lib/libavahi-ui.so.0
+libdata/pkgconfig/avahi-ui.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.glade
+@dirrm %%DATADIR%%/interfaces
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm include/avahi-ui
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
new file mode 100644
index 000000000000..249f9287a994
--- /dev/null
+++ b/net/avahi-libdns/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: avahi-libdns
+# Date created: 31 July 2007
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION= 0
+CATEGORIES= net
+PKGNAMESUFFIX= -libdns
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= mDNSResponder compatibility from Avahi
+
+LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi
+
+MASTERDIR= ${.CURDIR}/../avahi-app
+BUILD_WRKSRC= ${WRKSRC}/avahi-compat-libdns_sd
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE= libdns
+AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/pkg-descr b/net/avahi-libdns/pkg-descr
new file mode 100644
index 000000000000..a2a56e5199ac
--- /dev/null
+++ b/net/avahi-libdns/pkg-descr
@@ -0,0 +1,3 @@
+mDNSResponder compatibility from Avavhi
+
+WWW: http://www.avahi.org/
diff --git a/net/avahi-libdns/pkg-install b/net/avahi-libdns/pkg-install
new file mode 100644
index 000000000000..a7134b49febe
--- /dev/null
+++ b/net/avahi-libdns/pkg-install
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ USER=avahi-autoipd
+ GROUP=${USER}
+ UID=546
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "Avahi Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+ exit 0
+ ;;
+esac
diff --git a/net/avahi-libdns/pkg-plist b/net/avahi-libdns/pkg-plist
new file mode 100644
index 000000000000..16d0e55333ef
--- /dev/null
+++ b/net/avahi-libdns/pkg-plist
@@ -0,0 +1,7 @@
+include/avahi-compat-libdns_sd/dns_sd.h
+lib/libdns_sd.a
+lib/libdns_sd.la
+lib/libdns_sd.so
+lib/libdns_sd.so.1
+libdata/pkgconfig/avahi-compat-libdns_sd.pc
+@dirrm include/avahi-compat-libdns_sd
diff --git a/net/avahi-qt3/Makefile b/net/avahi-qt3/Makefile
index 45e0bf2904b1..5c9e18ca6bd6 100644
--- a/net/avahi-qt3/Makefile
+++ b/net/avahi-qt3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/net/avahi-qt3/Makefile,v 1.1 2007/07/31 18:24:12 ahze Exp $
PORTREVISION= 0
CATEGORIES= net
@@ -14,35 +14,15 @@ COMMENT= Qt 3 bindings to the Avahi mDNS system
LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi
-MASTERDIR= ${.CURDIR}/../avahi
+MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-qt
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-AVAHI_SLAVE= yes
-
+AVAHI_SLAVE= qt3
USE_GNOME= gnomehack gnometarget ltverhack
USE_QT_VER= 3
-CONFIGURE_ARGS= --disable-python \
- --disable-mono \
- --disable-monodoc \
- --disable-gtk \
- --enable-qt3 \
- --disable-qt4 \
- --localstatedir=/var \
- --disable-doxygen-docs \
- --disable-xml-docs \
- --disable-doxygen-dot \
- --with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
- --with-distro=freebsd
-
-post-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
- ${MAKE_FLAGS} Makefile ${MAKE_ARGS} avahi-qt3.pc
-
-post-install:
- ${MKDIR} ${PREFIX}/libdata/pkgconfig
- ${INSTALL_DATA} ${WRKSRC}/avahi-qt3.pc ${PREFIX}/libdata/pkgconfig
+AVAHI_PKGCONFIG= avahi-qt3.pc
.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index c488e52cbea7..f4d9e8ea48ff 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -17,41 +17,21 @@ LIB_DEPENDS= avahi-core:${PORTSDIR}/net/avahi
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
-MASTERDIR= ${.CURDIR}/../avahi
+MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-sharp
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-AVAHI_SLAVE= yes
-
-USE_GNOME= gnomehack gnometarget
-CONFIGURE_ARGS= --with-distro=freebsd \
- --with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
- --disable-gtk \
- --disable-qt3 \
- --disable-qt4 \
- --disable-python \
- --enable-mono \
- --disable-monodoc \
- --disable-doxygen-doc \
- --disable-doxygen-dot \
- --localstatedir=/var
+AVAHI_SLAVE= sharp
+AVAHI_PKGCONFIG=avahi-sharp.pc
post-patch:
@${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \
s|@COMMON_DLNAME@|libavahi-common.so|g; \
s|@GLIB_DLNAME@|libavahi-glib.so|g' \
${BUILD_WRKSRC}/avahi-sharp.dll.config.in
- @${REINPLACE_CMD} 's|@prefix@|${PREFIX}|g; \
- s|@libdir@|$${prefix}/lib|g; \
- s|@PACKAGE_VERSION@|${PORTVERSION}|g' \
- ${WRKSRC}/avahi-sharp.pc.in
- @${CP} ${WRKSRC}/avahi-sharp.pc.in ${WRKSRC}/avahi-sharp.pc
@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/avahi-sharp.pc ${PREFIX}/libdata/pkgconfig/
-
.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
.include "${MASTERDIR}/Makefile"
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 5a509b3cb7eb..e90d5a8c6ab0 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,101 +3,63 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
+# $MCom: ports/net/avahi/Makefile,v 1.26 2007/09/09 22:45:27 mezz Exp $
+#
PORTNAME= avahi
PORTVERSION= 0.6.21
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net dns
-MASTER_SITES= http://www.avahi.org/download/
-
-MAINTAINER?= gnome@FreeBSD.org
-COMMENT?= Service discovery on a local network
+MASTER_SITES= # empty
+DISTFILES= # empty
+EXTRACT_ONLY= # empty
-LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
- daemon.0:${PORTSDIR}/devel/libdaemon \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- gdbm.3:${PORTSDIR}/databases/gdbm
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= The "meta-port" for the Avahi service discovery suite
-USE_GNOME?= gnomehack ltverhack glib20
-USE_GNOME_SUBR=yes
-USE_RC_SUBR= yes
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
-USE_LDCONFIG= yes
-USE_GETOPT_LONG=yes
-CONFIGURE_ARGS?=--with-distro=freebsd \
- --with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
- --disable-qt3 \
- --disable-qt4 \
- --disable-python \
- --disable-mono \
- --disable-monodoc \
- --disable-doxygen-doc \
- --disable-doxygen-dot \
- --localstatedir=/var \
- --enable-compat-howl \
- --disable-autoipd
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+RUN_DEPENDS= avahi-resolve:${PORTSDIR}/net/avahi-app \
+ avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app
-.if !defined(AVAHI_SLAVE)
-CONFLICTS= howl-[0-9]*
+OPTIONS= AUTOIPD "IPv4LL network address configuration daemon" off \
+ GTK "Gtk+ tools and bindings" off \
+ LIBDNS "mDNSResponder compatibility" off \
+ MONO "Mono bindings" off \
+ QT3 "Qt 3 bindings" off \
+ QT4 "Qt 4 bindings" off \
+ PYTHON "Python bindings and tools" off
-MAN1= avahi-browse.1 avahi-publish.1 avahi-resolve.1 avahi-set-host-name.1
-MAN5= avahi-daemon.conf.5 avahi.service.5 avahi.hosts.5
-MAN8= avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
+NO_BUILD= yes
-MLINKS= avahi-browse.1 avahi-browse-domains.1 \
- avahi-publish.1 avahi-publish-address.1 \
- avahi-publish.1 avahi-publish-service.1 \
- avahi-resolve.1 avahi-resolve-address.1 \
- avahi-resolve.1 avahi-resolve-host-name.1
+.include <bsd.port.pre.mk>
-OPTIONS= GTK2 "Build a GTK+ 2 browser utility and other tools" off \
- LIBDNS "Enable mDNSResponder compatibility" off
+.if defined(WITH_AUTOIPD)
+RUN_DEPENDS+= avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
.endif
-.include <bsd.port.pre.mk>
+.if defined(WITH_GTK)
+RUN_DEPENDS+= avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
+.endif
-.if !defined(AVAHI_SLAVE)
.if defined(WITH_LIBDNS)
-CONFIGURE_ARGS+=--enable-compat-libdns_sd
-PLIST_SUB+= LIBDNS=""
-CONFLICTS+= mDNSResponder-[0-9]*
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+libdns
-.else
-CONFIGURE_ARGS+=--disable-compat-libdns_sd
-PLIST_SUB+= LIBDNS="@comment "
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
.endif
-.if defined(WITH_GTK2)
-USE_GNOME+= libglade2
-PLIST_SUB+= GTK=""
-MAN1+= bssh.1
-MLINKS+= bssh.1 bvnc.1
-.else
-CONFIGURE_ARGS+=--disable-gtk
-PLIST_SUB+= GTK="@comment "
+.if defined(WITH_MONO)
+RUN_DEPENDS+= ${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/avahi-client/Makefile.in \
- ${WRKSRC}/avahi-daemon/Makefile.in
- @${REINPLACE_CMD} -e 's|%%RC_SUBR%%|${RC_SUBR}| ; \
- s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
- ${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
- ${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
+.if defined(WITH_QT3)
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
+.endif
-post-install:
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if defined(WITH_QT4)
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
.endif
+.if defined(WITH_PYTHON)
+RUN_DEPENDS+= avahi-bookmarks:${PORTSDIR}/net/py-avahi
.endif
+do-install:
+
.include <bsd.port.post.mk>
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 6b59821f9981..d34d9f399cda 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -8,6 +8,7 @@
PORTNAME= blam
PORTVERSION= 1.8.4
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://www.cmartin.tk/blam/
@@ -32,9 +33,9 @@ MAN1= blam.1
GCONF_SCHEMAS= blam.schemas
post-patch:
- @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/blam/|g' \
+ @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/blam/|g' \
${WRKSRC}/themes/blam/theme.html
- @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/pimped/|g' \
+ @${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/pimped/|g' \
${WRKSRC}/themes/pimped/theme.html
diff --git a/net/blam/files/extra-libblam_blam-gecko-utils.cpp b/net/blam/files/extra-libblam_blam-gecko-utils.cpp
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/blam/files/extra-libblam_blam-gecko-utils.cpp
+++ /dev/null
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index ecfd7bf0326f..9cbf238201c8 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -7,31 +7,31 @@ lib/blam/libblam.a
lib/blam/libblam.la
lib/blam/libblam.so
lib/blam/libblam.so.0
-share/gnome/applications/blam.desktop
-share/gnome/blam/themes/planet/theme.html
-share/gnome/blam/themes/planet/planet.css
-share/gnome/blam/themes/planet/bubble-top.png
-share/gnome/blam/themes/planet/bubble-top-right.png
-share/gnome/blam/themes/planet/bubble-top-left.png
-share/gnome/blam/themes/planet/bubble-right.png
-share/gnome/blam/themes/planet/bubble-nipple.png
-share/gnome/blam/themes/planet/bubble-left.png
-share/gnome/blam/themes/planet/bubble-bottom.png
-share/gnome/blam/themes/planet/bubble-bottom-right.png
-share/gnome/blam/themes/planet/bubble-bottom-left.png
-share/gnome/blam/themes/pimped/theme.html
-share/gnome/blam/themes/pimped/pimped.css
-share/gnome/blam/themes/pimped/news.png
-share/gnome/blam/themes/pimped/blam.png
-share/gnome/blam/themes/blam/theme.html
-share/gnome/blam/themes/blam/blam-box-top-right.png
-share/gnome/blam/themes/blam/blam-box-top-left.png
-share/gnome/blam/themes/blam/blam-box-pad.png
-share/gnome/blam/themes/blam/blam-box-bottom-right.png
-share/gnome/blam/themes/blam/blam-box-bottom-left.png
-share/gnome/blam/themes/akregator/theme.html
-share/gnome/blam/collection.xml
-share/gnome/pixmaps/blam.png
+share/applications/blam.desktop
+share/blam/themes/planet/theme.html
+share/blam/themes/planet/planet.css
+share/blam/themes/planet/bubble-top.png
+share/blam/themes/planet/bubble-top-right.png
+share/blam/themes/planet/bubble-top-left.png
+share/blam/themes/planet/bubble-right.png
+share/blam/themes/planet/bubble-nipple.png
+share/blam/themes/planet/bubble-left.png
+share/blam/themes/planet/bubble-bottom.png
+share/blam/themes/planet/bubble-bottom-right.png
+share/blam/themes/planet/bubble-bottom-left.png
+share/blam/themes/pimped/theme.html
+share/blam/themes/pimped/pimped.css
+share/blam/themes/pimped/news.png
+share/blam/themes/pimped/blam.png
+share/blam/themes/blam/theme.html
+share/blam/themes/blam/blam-box-top-right.png
+share/blam/themes/blam/blam-box-top-left.png
+share/blam/themes/blam/blam-box-pad.png
+share/blam/themes/blam/blam-box-bottom-right.png
+share/blam/themes/blam/blam-box-bottom-left.png
+share/blam/themes/akregator/theme.html
+share/blam/collection.xml
+share/pixmaps/blam.png
share/locale/bg/LC_MESSAGES/blam.mo
share/locale/bs/LC_MESSAGES/blam.mo
share/locale/ca/LC_MESSAGES/blam.mo
@@ -82,10 +82,11 @@ share/locale/zh_TW/LC_MESSAGES/blam.mo
@dirrmtry share/locale/rw
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
-@dirrm share/gnome/blam/themes/planet
-@dirrm share/gnome/blam/themes/pimped
-@dirrm share/gnome/blam/themes/blam
-@dirrm share/gnome/blam/themes/akregator
-@dirrm share/gnome/blam/themes
-@dirrm share/gnome/blam
+@dirrm share/blam/themes/planet
+@dirrm share/blam/themes/pimped
+@dirrm share/blam/themes/blam
+@dirrm share/blam/themes/akregator
+@dirrm share/blam/themes
+@dirrm share/blam
@dirrm lib/blam
+@dirrmtry share/applications
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 652ba39f76c9..0eda368638ad 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -3,12 +3,12 @@
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
-# $MCom: ports/net/crescendo/Makefile,v 1.2 2006/10/07 16:29:01 mezz Exp $
+# $MCom: ports/net/crescendo/Makefile,v 1.6 2007/05/30 18:26:15 mezz Exp $
#
PORTNAME= crescendo
PORTVERSION= 1.1.7
-PORTREVISION= 6
+PORTREVISION= 8
CATEGORIES= net gnome
# Master Site broken
#MASTER_SITES= http://crescendo.lyrical.net/files/
@@ -27,7 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CFLAGS+= -g
PLIST_SUB= DOCDIR=share/doc/${PORTNAME}
-MODIFY= Makefile.in data/Makefile.in
USE_XLIB= yes
USE_GNOME= gnomelibs
@@ -38,13 +37,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|txtOutput|txtNotepadOutput|g' \
${WRKSRC}/src/notepad.c
-pre-patch:
-.for i in ${MODIFY}
- @${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
- ${SED} -e 's=$$(prefix)/share/=$$(datadir)/gnome/=g' \
- ${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
-.endfor
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/net/crescendo/pkg-plist b/net/crescendo/pkg-plist
index ca27d66e88b3..e13a206ce6e6 100644
--- a/net/crescendo/pkg-plist
+++ b/net/crescendo/pkg-plist
@@ -1,10 +1,10 @@
bin/crescendo
-share/gnome/crescendo/cr-about.jpg
-share/gnome/crescendo/cr-splash1.jpg
-share/gnome/crescendo/startup2.wav
+%%DATADIR%%/cr-about.jpg
+%%DATADIR%%/cr-splash1.jpg
+%%DATADIR%%/startup2.wav
share/gnome/apps/Internet/crescendo.desktop
-share/gnome/pixmaps/crescendo.png
-@dirrm share/gnome/crescendo
+share/pixmaps/crescendo.png
+@dirrm %%DATADIR%%
%%PORTDOCS%%%%DOCDIR%%/AUTHORS
%%PORTDOCS%%%%DOCDIR%%/ChangeLog
%%PORTDOCS%%%%DOCDIR%%/HACKING
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index 1c59cbb13bcc..e268632dffec 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= diradmin
PORTVERSION= 1.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= http://diradmin.open-it.org/releases/ \
http://diradmin.open-it.org/releases/old/
diff --git a/net/diradmin/files/patch-configure b/net/diradmin/files/patch-configure
index 066499b4fe00..68576e1c7018 100644
--- a/net/diradmin/files/patch-configure
+++ b/net/diradmin/files/patch-configure
@@ -9,12 +9,3 @@
-@@ -5625,7 +5625,7 @@
-
- fi
-
--PACKAGE_PIXMAPS_DIR="/share/pixmaps/${PACKAGE}"
-+PACKAGE_PIXMAPS_DIR="/share/gnome/pixmaps/${PACKAGE}"
-
- PACKAGE_APPLNK_DIR="/share/applications"
- SYSTEM_MENU_DIR="/lib/menu"
diff --git a/net/diradmin/pkg-plist b/net/diradmin/pkg-plist
index c01186ec2b6d..4fb65be2b350 100644
--- a/net/diradmin/pkg-plist
+++ b/net/diradmin/pkg-plist
@@ -1,23 +1,23 @@
bin/directory_administrator
share/applications/dragonfear-directory_administrator.desktop
-share/gnome/pixmaps/directory_administrator/briefcase.png
-share/gnome/pixmaps/directory_administrator/byruddo.png
-share/gnome/pixmaps/directory_administrator/cellphone.png
-share/gnome/pixmaps/directory_administrator/diradminlogo.ico
-share/gnome/pixmaps/directory_administrator/diradminlogo.png
-share/gnome/pixmaps/directory_administrator/diradminlogo.xcf
-share/gnome/pixmaps/directory_administrator/gnome-computer.png
-share/gnome/pixmaps/directory_administrator/gnome-gnomecard.png
-share/gnome/pixmaps/directory_administrator/gnome-who.png
-share/gnome/pixmaps/directory_administrator/group-icon.xpm
-share/gnome/pixmaps/directory_administrator/house.png
-share/gnome/pixmaps/directory_administrator/ico-mail.png
-share/gnome/pixmaps/directory_administrator/new-16.xpm
-share/gnome/pixmaps/directory_administrator/new.xpm
-share/gnome/pixmaps/directory_administrator/newgroup-16.xpm
-share/gnome/pixmaps/directory_administrator/newgroup.xpm
-share/gnome/pixmaps/directory_administrator/old-group-icon.xpm
-share/gnome/pixmaps/directory_administrator/old-user-icon.xpm
-share/gnome/pixmaps/directory_administrator/user-icon.xpm
-@dirrm share/gnome/pixmaps/directory_administrator
+share/pixmaps/directory_administrator/briefcase.png
+share/pixmaps/directory_administrator/byruddo.png
+share/pixmaps/directory_administrator/cellphone.png
+share/pixmaps/directory_administrator/diradminlogo.ico
+share/pixmaps/directory_administrator/diradminlogo.png
+share/pixmaps/directory_administrator/diradminlogo.xcf
+share/pixmaps/directory_administrator/gnome-computer.png
+share/pixmaps/directory_administrator/gnome-gnomecard.png
+share/pixmaps/directory_administrator/gnome-who.png
+share/pixmaps/directory_administrator/group-icon.xpm
+share/pixmaps/directory_administrator/house.png
+share/pixmaps/directory_administrator/ico-mail.png
+share/pixmaps/directory_administrator/new-16.xpm
+share/pixmaps/directory_administrator/new.xpm
+share/pixmaps/directory_administrator/newgroup-16.xpm
+share/pixmaps/directory_administrator/newgroup.xpm
+share/pixmaps/directory_administrator/old-group-icon.xpm
+share/pixmaps/directory_administrator/old-user-icon.xpm
+share/pixmaps/directory_administrator/user-icon.xpm
+@dirrm share/pixmaps/directory_administrator
@dirrmtry share/applications
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e95198e27f28..0f9975eb55b4 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.9
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -62,10 +63,4 @@ CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= DBUS:="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|${PREFIX}/share/gnome|' \
- ${WRKSRC}/*schemas*
- @${REINPLACE_CMD} -e 's|{datadir}/dbus-1|(prefix)/share/dbus-1|g' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.post.mk>
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index bc90b586baa8..79263d01bd31 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -4,7 +4,7 @@ bin/ekiga-config-tool
libdata/bonobo/servers/ekiga.server
%%DBUS:%%share/dbus-1/services/net.ekiga.helper.service
%%DBUS:%%share/dbus-1/services/net.ekiga.instance.service
-share/gnome/applications/ekiga.desktop
+share/applications/ekiga.desktop
share/gnome/help/ekiga/C/ekiga.xml
share/gnome/help/ekiga/C/figures/accounts_d1.png
share/gnome/help/ekiga/C/figures/accounts_h323.png
@@ -24,6 +24,25 @@ share/gnome/help/ekiga/C/figures/config_d8.png
share/gnome/help/ekiga/C/figures/config_d9.png
share/gnome/help/ekiga/C/figures/lumi.png
share/gnome/help/ekiga/C/figures/stats.png
+share/gnome/help/ekiga/pt_BR/ekiga.xml
+share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
+share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
+share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
+share/gnome/help/ekiga/pt_BR/figures/call_d1.png
+share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d1.png
+share/gnome/help/ekiga/pt_BR/figures/config_d10.png
+share/gnome/help/ekiga/pt_BR/figures/config_d2.png
+share/gnome/help/ekiga/pt_BR/figures/config_d3.png
+share/gnome/help/ekiga/pt_BR/figures/config_d4.png
+share/gnome/help/ekiga/pt_BR/figures/config_d5.png
+share/gnome/help/ekiga/pt_BR/figures/config_d6.png
+share/gnome/help/ekiga/pt_BR/figures/config_d7.png
+share/gnome/help/ekiga/pt_BR/figures/config_d8.png
+share/gnome/help/ekiga/pt_BR/figures/config_d9.png
+share/gnome/help/ekiga/pt_BR/figures/lumi.png
+share/gnome/help/ekiga/pt_BR/figures/stats.png
share/gnome/help/ekiga/bg/ekiga.xml
share/gnome/help/ekiga/bg/figures/accounts_d1.png
share/gnome/help/ekiga/bg/figures/accounts_h323.png
@@ -100,25 +119,6 @@ share/gnome/help/ekiga/fr/figures/config_d8.png
share/gnome/help/ekiga/fr/figures/config_d9.png
share/gnome/help/ekiga/fr/figures/lumi.png
share/gnome/help/ekiga/fr/figures/stats.png
-share/gnome/help/ekiga/pt_BR/ekiga.xml
-share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
-share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
-share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
-share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
-share/gnome/help/ekiga/pt_BR/figures/call_d1.png
-share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
-share/gnome/help/ekiga/pt_BR/figures/config_d1.png
-share/gnome/help/ekiga/pt_BR/figures/config_d10.png
-share/gnome/help/ekiga/pt_BR/figures/config_d2.png
-share/gnome/help/ekiga/pt_BR/figures/config_d3.png
-share/gnome/help/ekiga/pt_BR/figures/config_d4.png
-share/gnome/help/ekiga/pt_BR/figures/config_d5.png
-share/gnome/help/ekiga/pt_BR/figures/config_d6.png
-share/gnome/help/ekiga/pt_BR/figures/config_d7.png
-share/gnome/help/ekiga/pt_BR/figures/config_d8.png
-share/gnome/help/ekiga/pt_BR/figures/config_d9.png
-share/gnome/help/ekiga/pt_BR/figures/lumi.png
-share/gnome/help/ekiga/pt_BR/figures/stats.png
share/gnome/help/ekiga/sv/ekiga.xml
share/gnome/help/ekiga/sv/figures/accounts_d1.png
share/gnome/help/ekiga/sv/figures/accounts_h323.png
@@ -157,22 +157,22 @@ share/gnome/help/ekiga/uk/figures/config_d8.png
share/gnome/help/ekiga/uk/figures/config_d9.png
share/gnome/help/ekiga/uk/figures/lumi.png
share/gnome/help/ekiga/uk/figures/stats.png
-share/gnome/omf/ekiga/ekiga-C.omf
-share/gnome/omf/ekiga/ekiga-bg.omf
-share/gnome/omf/ekiga/ekiga-de.omf
-share/gnome/omf/ekiga/ekiga-es.omf
-share/gnome/omf/ekiga/ekiga-fr.omf
-share/gnome/omf/ekiga/ekiga-pt_BR.omf
-share/gnome/omf/ekiga/ekiga-sv.omf
-share/gnome/omf/ekiga/ekiga-uk.omf
-share/gnome/pixmaps/ekiga.png
-share/gnome/pixmaps/ekiga/ekiga-logo.png
-share/gnome/pixmaps/ekiga/ekiga.png
-share/gnome/sounds/ekiga/busytone.wav
-share/gnome/sounds/ekiga/dialtone.wav
-share/gnome/sounds/ekiga/newmessage.wav
-share/gnome/sounds/ekiga/ring.wav
-share/gnome/sounds/ekiga/voicemail.wav
+share/omf/ekiga/ekiga-C.omf
+share/omf/ekiga/ekiga-bg.omf
+share/omf/ekiga/ekiga-de.omf
+share/omf/ekiga/ekiga-es.omf
+share/omf/ekiga/ekiga-fr.omf
+share/omf/ekiga/ekiga-pt_BR.omf
+share/omf/ekiga/ekiga-sv.omf
+share/omf/ekiga/ekiga-uk.omf
+share/pixmaps/ekiga.png
+share/pixmaps/ekiga/ekiga-logo.png
+share/pixmaps/ekiga/ekiga.png
+share/sounds/ekiga/busytone.wav
+share/sounds/ekiga/dialtone.wav
+share/sounds/ekiga/newmessage.wav
+share/sounds/ekiga/ring.wav
+share/sounds/ekiga/voicemail.wav
share/locale/am/LC_MESSAGES/ekiga.mo
share/locale/ar/LC_MESSAGES/ekiga.mo
share/locale/az/LC_MESSAGES/ekiga.mo
@@ -244,9 +244,9 @@ share/locale/xh/LC_MESSAGES/ekiga.mo
share/locale/zh_CN/LC_MESSAGES/ekiga.mo
share/locale/zh_HK/LC_MESSAGES/ekiga.mo
share/locale/zh_TW/LC_MESSAGES/ekiga.mo
-@dirrm share/gnome/sounds/ekiga
-@dirrm share/gnome/pixmaps/ekiga
-@dirrm share/gnome/omf/ekiga
+@dirrm share/sounds/ekiga
+@dirrm share/pixmaps/ekiga
+@dirrm share/omf/ekiga
@dirrm share/gnome/help/ekiga/uk/figures
@dirrm share/gnome/help/ekiga/uk
@dirrm share/gnome/help/ekiga/sv/figures
@@ -278,3 +278,4 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/net/evolution-rss/Makefile b/net/evolution-rss/Makefile
new file mode 100644
index 000000000000..a5922514d0c3
--- /dev/null
+++ b/net/evolution-rss/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: evolution-rss
+# Date created: 2007-09-21
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net/evolution-rss/Makefile,v 1.2 2007/10/11 12:35:05 ahze Exp $
+
+PORTNAME= evolution-rss
+PORTVERSION= 0.0.5
+PORTREVISION= 1
+CATEGORIES= net gnome
+MASTER_SITES= http://mips.edu.ms/
+
+MAINTAINER= ahze@FreeBSD.org
+COMMENT= RSS Feeds support for evolution mail
+
+BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
+
+USE_GECKO= firefox
+USE_GNOME= intltool
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GETTEXT= yes
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|@serverdir@|${PREFIX}/libdata/bonobo/servers|' \
+ ${WRKSRC}/src/Makefile.in
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+.include <bsd.port.post.mk>
diff --git a/net/evolution-rss/distinfo b/net/evolution-rss/distinfo
new file mode 100644
index 000000000000..d5c12141853c
--- /dev/null
+++ b/net/evolution-rss/distinfo
@@ -0,0 +1,3 @@
+MD5 (evolution-rss-0.0.5.tar.gz) = 227a95b7b7d5c90e930226a9534551c6
+SHA256 (evolution-rss-0.0.5.tar.gz) = ea55cd59c229787bd0a8db1b752b9014b8b5ebda41969a85c6f87154021779bd
+SIZE (evolution-rss-0.0.5.tar.gz) = 422495
diff --git a/net/evolution-rss/pkg-descr b/net/evolution-rss/pkg-descr
new file mode 100644
index 000000000000..aabc4646ef91
--- /dev/null
+++ b/net/evolution-rss/pkg-descr
@@ -0,0 +1,3 @@
+RSS Feeds support for evolution mail
+
+WWW: http://mips.edu.ms/evo/index.php/Evolution_RSS_Reader_Plugin
diff --git a/net/evolution-rss/pkg-plist b/net/evolution-rss/pkg-plist
new file mode 100644
index 000000000000..2b73f273f321
--- /dev/null
+++ b/net/evolution-rss/pkg-plist
@@ -0,0 +1,10 @@
+lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.la
+lib/evolution/2.12/plugins/liborg-gnome-evolution-rss.so
+lib/evolution/2.12/plugins/org-gnome-evolution-rss.eplug
+lib/evolution/2.12/plugins/org-gnome-evolution-rss.xml
+libdata/bonobo/servers/GNOME_Evolution_RSS_2.12.server
+share/evolution/2.12/errors/org-gnome-evolution-rss.error
+share/evolution/2.12/images/rss.png
+share/evolution/glade/rss-ui.glade
+share/locale/en_AU/LC_MESSAGES/evolution-rss.mo
+share/locale/sv/LC_MESSAGES/evolution-rss.mo
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 9b56fb06800c..91a8f3752891 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= g2ipmsg
PORTVERSION= 0.9.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= http://www.ipmsg.org/archive/ \
${MASTER_SITE_LOCAL} \
diff --git a/net/g2ipmsg/pkg-plist b/net/g2ipmsg/pkg-plist
index 57915357800b..b0288b1deeeb 100644
--- a/net/g2ipmsg/pkg-plist
+++ b/net/g2ipmsg/pkg-plist
@@ -1,14 +1,15 @@
bin/g2ipmsg
bin/g2ipmsg_applet
libdata/bonobo/servers/g2ipmsg.server
-share/gnome/applications/g2ipmsg.desktop
-share/gnome/gnome-2.0/ui/g2ipmsg.xml
-share/gnome/pixmaps/ipmsg.png
-share/gnome/pixmaps/g2ipmsg/ipmsg.xpm
-share/gnome/pixmaps/g2ipmsg/ipmsgrev.xpm
-share/gnome/sounds/g2ipmsg/g2ipmsg.ogg
+share/applications/g2ipmsg.desktop
+share/gnome-2.0/ui/g2ipmsg.xml
+share/pixmaps/ipmsg.png
+share/pixmaps/g2ipmsg/ipmsg.xpm
+share/pixmaps/g2ipmsg/ipmsgrev.xpm
+share/sounds/g2ipmsg/g2ipmsg.ogg
share/locale/ja/LC_MESSAGES/g2ipmsg.mo
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrm share/gnome/sounds/g2ipmsg
-@dirrm share/gnome/pixmaps/g2ipmsg
+@dirrm share/sounds/g2ipmsg
+@dirrm share/pixmaps/g2ipmsg
+@dirrmtry share/applications
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 37383a835917..afad5e060acd 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnoemoe
PORTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://www.icecrew.nl/software/gnoemoe/download/
diff --git a/net/gnoemoe/files/patch-Makefile.in b/net/gnoemoe/files/patch-Makefile.in
deleted file mode 100644
index 29bcf9f697f1..000000000000
--- a/net/gnoemoe/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Dec 14 09:34:20 2004
-+++ Makefile.in Fri Jan 14 18:51:47 2005
-@@ -186,7 +186,7 @@
- langdir = $(datadir)/gtksourceview-1.0/language-specs
- lang_DATA = moo.lang
-
--mimedir = $(datadir)/mime/packages
-+mimedir = $(prefix)/share/mime/packages
- mime_DATA = gnoemoe.xml
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/net/gnoemoe/files/patch-po-Makefile.in.in b/net/gnoemoe/files/patch-po-Makefile.in.in
deleted file mode 100644
index add512d0d84f..000000000000
--- a/net/gnoemoe/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig Tue Dec 14 09:34:17 2004
-+++ po/Makefile.in.in Fri Jan 14 18:34:59 2005
-@@ -29,7 +29,7 @@
- datadir = @datadir@
- libdir = @libdir@
- localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
-+gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
- subdir = po
- install_sh = @install_sh@
diff --git a/net/gnoemoe/pkg-plist b/net/gnoemoe/pkg-plist
index 6a10c3c2c292..c86db120f32d 100644
--- a/net/gnoemoe/pkg-plist
+++ b/net/gnoemoe/pkg-plist
@@ -1,50 +1,51 @@
bin/gnoemoe
-share/gnome/applications/gnoemoe.desktop
-share/gnome/gnoemoe/gnoemoe.glade
-share/gnome/gnoemoe/pixmaps/browser.png
-share/gnome/gnoemoe/pixmaps/close.xpm
-share/gnome/gnoemoe/pixmaps/editor.xpm
-share/gnome/gnoemoe/pixmaps/editor_text.xpm
-share/gnome/gnoemoe/pixmaps/editor_verb.xpm
-share/gnome/gnoemoe/pixmaps/gnoemoe_logo.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/avail+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/away+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/away.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/busy+idle.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/busy.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/inhabitant.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/programmer.svg
-share/gnome/gnoemoe/pixmaps/ice-userlist/wizard.svg
-share/gnome/gnoemoe/pixmaps/saveclose.xpm
-share/gnome/gnoemoe/pixmaps/terminal.png
-share/gnome/gnoemoe/pixmaps/tray/active.svg
-share/gnome/gnoemoe/pixmaps/tray/default.svg
-share/gnome/gnoemoe/pixmaps/userlist/away.svg
-share/gnome/gnoemoe/pixmaps/userlist/friend.svg
-share/gnome/gnoemoe/pixmaps/userlist/idle.svg
-share/gnome/gnoemoe/pixmaps/userlist/idleaway.svg
-share/gnome/gnoemoe/pixmaps/userlist/inhabitant.svg
-share/gnome/gnoemoe/pixmaps/userlist/inhabitantplus.svg
-share/gnome/gnoemoe/pixmaps/userlist/key.svg
-share/gnome/gnoemoe/pixmaps/userlist/newbie.svg
-share/gnome/gnoemoe/pixmaps/userlist/schooled.svg
-share/gnome/gnoemoe/pixmaps/userlist/star.svg
-share/gnome/gnoemoe/pixmaps/userlist/wizard.svg
-share/gnome/gnoemoe/pixmaps/world.png
-share/gnome/gnoemoe/pixmaps/world_inactive.png
-share/gnome/gnoemoe/scripts/editing.rb
-share/gnome/gnoemoe/scripts/misc.rb
-share/gnome/gnoemoe/scripts/music.rb
-share/gnome/gnoemoe/scripts/run.rb
-share/gnome/gtksourceview-1.0/language-specs/moo.lang
-share/gnome/pixmaps/gnoemoe-logo.svg
+share/applications/gnoemoe.desktop
+share/gnoemoe/gnoemoe.glade
+share/gnoemoe/pixmaps/browser.png
+share/gnoemoe/pixmaps/close.xpm
+share/gnoemoe/pixmaps/editor.xpm
+share/gnoemoe/pixmaps/editor_text.xpm
+share/gnoemoe/pixmaps/editor_verb.xpm
+share/gnoemoe/pixmaps/gnoemoe_logo.svg
+share/gnoemoe/pixmaps/ice-userlist/avail+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/away+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/away.svg
+share/gnoemoe/pixmaps/ice-userlist/busy+idle.svg
+share/gnoemoe/pixmaps/ice-userlist/busy.svg
+share/gnoemoe/pixmaps/ice-userlist/inhabitant.svg
+share/gnoemoe/pixmaps/ice-userlist/programmer.svg
+share/gnoemoe/pixmaps/ice-userlist/wizard.svg
+share/gnoemoe/pixmaps/saveclose.xpm
+share/gnoemoe/pixmaps/terminal.png
+share/gnoemoe/pixmaps/tray/active.svg
+share/gnoemoe/pixmaps/tray/default.svg
+share/gnoemoe/pixmaps/userlist/away.svg
+share/gnoemoe/pixmaps/userlist/friend.svg
+share/gnoemoe/pixmaps/userlist/idle.svg
+share/gnoemoe/pixmaps/userlist/idleaway.svg
+share/gnoemoe/pixmaps/userlist/inhabitant.svg
+share/gnoemoe/pixmaps/userlist/inhabitantplus.svg
+share/gnoemoe/pixmaps/userlist/key.svg
+share/gnoemoe/pixmaps/userlist/newbie.svg
+share/gnoemoe/pixmaps/userlist/schooled.svg
+share/gnoemoe/pixmaps/userlist/star.svg
+share/gnoemoe/pixmaps/userlist/wizard.svg
+share/gnoemoe/pixmaps/world.png
+share/gnoemoe/pixmaps/world_inactive.png
+share/gnoemoe/scripts/editing.rb
+share/gnoemoe/scripts/misc.rb
+share/gnoemoe/scripts/music.rb
+share/gnoemoe/scripts/run.rb
+share/gtksourceview-1.0/language-specs/moo.lang
+share/pixmaps/gnoemoe-logo.svg
share/locale/nl/LC_MESSAGES/gnoemoe.mo
share/mime/packages/gnoemoe.xml
-@dirrm share/gnome/gnoemoe/scripts
-@dirrm share/gnome/gnoemoe/pixmaps/userlist
-@dirrm share/gnome/gnoemoe/pixmaps/tray
-@dirrm share/gnome/gnoemoe/pixmaps/ice-userlist
-@dirrm share/gnome/gnoemoe/pixmaps
-@dirrm share/gnome/gnoemoe
+@dirrm share/gnoemoe/scripts
+@dirrm share/gnoemoe/pixmaps/userlist
+@dirrm share/gnoemoe/pixmaps/tray
+@dirrm share/gnoemoe/pixmaps/ice-userlist
+@dirrm share/gnoemoe/pixmaps
+@dirrm share/gnoemoe
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 18fcd99193e4..01c7a9d30126 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-mud
PORTVERSION= 0.10.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/net/gnome-mud/pkg-plist b/net/gnome-mud/pkg-plist
index f81f91edef0d..07ae39f92ee2 100644
--- a/net/gnome-mud/pkg-plist
+++ b/net/gnome-mud/pkg-plist
@@ -1,6 +1,6 @@
bin/gnome-mud
-share/gnome/applications/gnome-mud.desktop
-share/gnome/gnome-mud/directions.glade
+share/applications/gnome-mud.desktop
+share/gnome-mud/directions.glade
share/gnome/help/gnome-mud/C/figures/connections-window.png
share/gnome/help/gnome-mud/C/figures/main-window.png
share/gnome/help/gnome-mud/C/figures/mudlist-window.png
@@ -9,12 +9,12 @@ share/gnome/help/gnome-mud/C/figures/profiles-window.png
share/gnome/help/gnome-mud/C/gnome-mud-manual.xml
share/gnome/help/gnome-mud/C/gnome-mud-plugin-api.xml
share/gnome/help/gnome-mud/C/monitor.py
-share/gnome/omf/gnome-mud/gnome-mud-manual-C.omf
-share/gnome/omf/gnome-mud/gnome-mud-plugin-api-C.omf
-share/gnome/pixmaps/gnome-mud/connection-offline.png
-share/gnome/pixmaps/gnome-mud/connection-online.png
-share/gnome/pixmaps/gnome-mud/gnome-mud-tray-icon.png
-share/gnome/pixmaps/gnome-mud.png
+share/omf/gnome-mud/gnome-mud-manual-C.omf
+share/omf/gnome-mud/gnome-mud-plugin-api-C.omf
+share/pixmaps/gnome-mud/connection-offline.png
+share/pixmaps/gnome-mud/connection-online.png
+share/pixmaps/gnome-mud/gnome-mud-tray-icon.png
+share/pixmaps/gnome-mud.png
share/locale/az/LC_MESSAGES/gnome-mud.mo
share/locale/ca/LC_MESSAGES/gnome-mud.mo
share/locale/cs/LC_MESSAGES/gnome-mud.mo
@@ -37,11 +37,12 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-mud.mo
share/locale/sv/LC_MESSAGES/gnome-mud.mo
share/locale/tr/LC_MESSAGES/gnome-mud.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mud.mo
-@dirrm share/gnome/pixmaps/gnome-mud
-@dirrm share/gnome/omf/gnome-mud
+@dirrm share/pixmaps/gnome-mud
+@dirrm share/omf/gnome-mud
@dirrm share/gnome/help/gnome-mud/C/figures
@dirrm share/gnome/help/gnome-mud/C
@dirrm share/gnome/help/gnome-mud
-@dirrm share/gnome/gnome-mud
+@dirrm share/gnome-mud
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 2f3e70cd5629..e9819bf3807c 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,16 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-netstatus/Makefile,v 1.41 2006/07/23 01:10:49 mezz Exp $
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.48 2007/07/04 21:42:20 marcus Exp $
#
PORTNAME= gnome-netstatus
PORTVERSION= 2.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12
-DISTNAME= gnome-netstatus-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index aa2ec728fad4..b9ca84c79d5c 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -1,7 +1,7 @@
libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
libexec/gnome-netstatus-applet
-share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome/gnome-netstatus/gnome-netstatus.glade
+share/gnome-2.0/ui/GNOME_NetstatusApplet.xml
+share/gnome-netstatus/gnome-netstatus.glade
share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/C/legal.xml
share/gnome/help/gnome-netstatus/bg/gnome-netstatus.xml
@@ -68,23 +68,23 @@ share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png
share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/zh_TW/legal.xml
-share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-bg.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-nl.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-pa.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-ru.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
-share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
-share/gnome/pixmaps/gnome-netstatus-tx.png
+share/omf/gnome-netstatus/gnome-netstatus-C.omf
+share/omf/gnome-netstatus/gnome-netstatus-bg.omf
+share/omf/gnome-netstatus/gnome-netstatus-de.omf
+share/omf/gnome-netstatus/gnome-netstatus-es.omf
+share/omf/gnome-netstatus/gnome-netstatus-fr.omf
+share/omf/gnome-netstatus/gnome-netstatus-it.omf
+share/omf/gnome-netstatus/gnome-netstatus-ja.omf
+share/omf/gnome-netstatus/gnome-netstatus-ko.omf
+share/omf/gnome-netstatus/gnome-netstatus-nl.omf
+share/omf/gnome-netstatus/gnome-netstatus-pa.omf
+share/omf/gnome-netstatus/gnome-netstatus-ru.omf
+share/omf/gnome-netstatus/gnome-netstatus-sv.omf
+share/omf/gnome-netstatus/gnome-netstatus-uk.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
+share/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
+share/pixmaps/gnome-netstatus-tx.png
share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png
share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png
share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png
@@ -164,7 +164,7 @@ share/locale/xh/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_HK/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/omf/gnome-netstatus
+@dirrm share/omf/gnome-netstatus
@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
@dirrm share/gnome/help/gnome-netstatus/zh_TW
@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
@@ -189,7 +189,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/bg
@dirrm share/gnome/help/gnome-netstatus/C
@dirrm share/gnome/help/gnome-netstatus
-@dirrm share/gnome/gnome-netstatus
+@dirrm share/gnome-netstatus
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 11546a4107df..5463ef66074c 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.35 2007/03/13 12:41:51 ahze Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.40 2007/09/18 14:09:24 ahze Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.0
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -32,8 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS+= -DHAVE_SOCKADDR_SA_LEN
post-install:
- ${MKDIR} ${PREFIX}/share/gnome/pixmaps
- ${LN} -sf ${PREFIX}/share/gnome/gnome-nettool/pixmaps/gnome-nettool.png \
- ${PREFIX}/share/gnome/pixmaps/gnome-nettool.png
+ ${MKDIR} ${PREFIX}/share/pixmaps
+ ${LN} -sf ${PREFIX}/share/gnome-nettool/pixmaps/gnome-nettool.png \
+ ${PREFIX}/share/pixmaps/gnome-nettool.png
.include <bsd.port.mk>
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 9adbfe2e9736..60572e77e0f0 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 596616cf631b5bc9ec0c873208ccfce9
-SHA256 (gnome2/gnome-nettool-2.18.0.tar.bz2) = 348b6c0f0c7d58df1514f87956e6987fcccc418d1cfea98a1f3a1b84e4d60e57
-SIZE (gnome2/gnome-nettool-2.18.0.tar.bz2) = 511010
+MD5 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8f16e4207655ccf1e7af679fc0f58bbd
+SHA256 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15
+SIZE (gnome2/gnome-nettool-2.20.0.tar.bz2) = 572137
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 17424514cc9a..50ceb8333f26 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -1,24 +1,28 @@
bin/gnome-nettool
-share/gnome/applications/gnome-nettool.desktop
-share/gnome/gnome-nettool/dialogs/gnome-nettool.glade
-share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm
-share/gnome/gnome-nettool/pixmaps/16_loopback.xpm
-share/gnome/gnome-nettool/pixmaps/16_plip.xpm
-share/gnome/gnome-nettool/pixmaps/16_ppp.xpm
-share/gnome/gnome-nettool/pixmaps/irda-16.png
-share/gnome/gnome-nettool/pixmaps/network.png
-share/gnome/gnome-nettool/pixmaps/wavelan-16.png
+share/applications/gnome-nettool.desktop
+%%DATADIR%%/dialogs/gnome-nettool.glade
+%%DATADIR%%/pixmaps/16_ethernet.xpm
+%%DATADIR%%/pixmaps/16_loopback.xpm
+%%DATADIR%%/pixmaps/16_plip.xpm
+%%DATADIR%%/pixmaps/16_ppp.xpm
+%%DATADIR%%/pixmaps/gnome-nettool.png
+%%DATADIR%%/pixmaps/irda-16.png
+%%DATADIR%%/pixmaps/network.png
+%%DATADIR%%/pixmaps/wavelan-16.png
share/gnome/help/gnome-nettool/C/gnome-nettool.xml
share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
+share/gnome/help/gnome-nettool/es/gnome-nettool.xml
share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
+share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
-share/gnome/omf/gnome-nettool/gnome-nettool-C.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-fr.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-pa.omf
-share/gnome/omf/gnome-nettool/gnome-nettool-sv.omf
-share/gnome/pixmaps/gnome-nettool.png
-share/icons/hicolor/48x48/apps/gnome-nettool.png
+share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
+share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
+share/icons/hicolor/16x16/apps/gnome-nettool.png
+share/icons/hicolor/22x22/apps/gnome-nettool.png
+share/icons/hicolor/32x32/apps/gnome-nettool.png
+share/icons/hicolor/scalable/apps/gnome-nettool.svg
share/locale/ar/LC_MESSAGES/gnome-nettool.mo
share/locale/az/LC_MESSAGES/gnome-nettool.mo
share/locale/bg/LC_MESSAGES/gnome-nettool.mo
@@ -63,6 +67,7 @@ share/locale/ms/LC_MESSAGES/gnome-nettool.mo
share/locale/nb/LC_MESSAGES/gnome-nettool.mo
share/locale/ne/LC_MESSAGES/gnome-nettool.mo
share/locale/nl/LC_MESSAGES/gnome-nettool.mo
+share/locale/oc/LC_MESSAGES/gnome-nettool.mo
share/locale/or/LC_MESSAGES/gnome-nettool.mo
share/locale/pa/LC_MESSAGES/gnome-nettool.mo
share/locale/pl/LC_MESSAGES/gnome-nettool.mo
@@ -71,6 +76,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
share/locale/ro/LC_MESSAGES/gnome-nettool.mo
share/locale/ru/LC_MESSAGES/gnome-nettool.mo
share/locale/rw/LC_MESSAGES/gnome-nettool.mo
+share/locale/si/LC_MESSAGES/gnome-nettool.mo
share/locale/sk/LC_MESSAGES/gnome-nettool.mo
share/locale/sl/LC_MESSAGES/gnome-nettool.mo
share/locale/sq/LC_MESSAGES/gnome-nettool.mo
@@ -78,6 +84,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo
share/locale/sv/LC_MESSAGES/gnome-nettool.mo
share/locale/ta/LC_MESSAGES/gnome-nettool.mo
+share/locale/te/LC_MESSAGES/gnome-nettool.mo
share/locale/th/LC_MESSAGES/gnome-nettool.mo
share/locale/tr/LC_MESSAGES/gnome-nettool.mo
share/locale/uk/LC_MESSAGES/gnome-nettool.mo
@@ -87,12 +94,42 @@ share/locale/xh/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
+share/omf/gnome-nettool/gnome-nettool-C.omf
+share/omf/gnome-nettool/gnome-nettool-ca.omf
+share/omf/gnome-nettool/gnome-nettool-es.omf
+share/omf/gnome-nettool/gnome-nettool-fr.omf
+share/omf/gnome-nettool/gnome-nettool-oc.omf
+share/omf/gnome-nettool/gnome-nettool-pa.omf
+share/omf/gnome-nettool/gnome-nettool-sv.omf
+share/omf/gnome-nettool/gnome-nettool-uk.omf
+share/omf/gnome-nettool/gnome-nettool-vi.omf
+share/pixmaps/gnome-nettool.png
+@dirrm share/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/vi
+@dirrm share/gnome/help/gnome-nettool/uk
+@dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/pa
+@dirrm share/gnome/help/gnome-nettool/oc
+@dirrm share/gnome/help/gnome-nettool/fr
+@dirrm share/gnome/help/gnome-nettool/es
+@dirrm share/gnome/help/gnome-nettool/ca
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/dialogs
+@dirrm %%DATADIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -101,12 +138,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrm share/gnome/omf/gnome-nettool
-@dirrm share/gnome/help/gnome-nettool/sv
-@dirrm share/gnome/help/gnome-nettool/pa
-@dirrm share/gnome/help/gnome-nettool/fr
-@dirrm share/gnome/help/gnome-nettool/C
-@dirrm share/gnome/help/gnome-nettool
-@dirrm share/gnome/gnome-nettool/pixmaps
-@dirrm share/gnome/gnome-nettool/dialogs
-@dirrm share/gnome/gnome-nettool
+@dirrmtry share/applications
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index b5e920472335..0cd8ffd84407 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnometelnet
PORTVERSION= 2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= http://www.cyest.org/downloads/
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
@@ -34,11 +34,11 @@ post-install:
@${MKDIR} ${PREFIX}/share/gnome/apps/Internet
${INSTALL_DATA} ${WRKSRC}/share/GTelnet.desktop \
${PREFIX}/share/gnome/apps/Internet
- @${MKDIR} ${PREFIX}/share/gnome/pixmaps
+ @${MKDIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/share/*.png \
- ${PREFIX}/share/gnome/pixmaps
- @${MKDIR} ${PREFIX}/share/gnome/pixmaps/gnome-telnet
+ ${PREFIX}/share/pixmaps
+ @${MKDIR} ${PREFIX}/share/pixmaps/gnome-telnet
${INSTALL_DATA} ${WRKSRC}/share/*.jpg \
- ${PREFIX}/share/gnome/pixmaps/gnome-telnet
+ ${PREFIX}/share/pixmaps/gnome-telnet
.include <bsd.port.mk>
diff --git a/net/gnometelnet/pkg-plist b/net/gnometelnet/pkg-plist
index 094b0af242fa..5d8b745db1cd 100644
--- a/net/gnometelnet/pkg-plist
+++ b/net/gnometelnet/pkg-plist
@@ -1,9 +1,9 @@
bin/gnome-telnet
share/gnome/apps/Internet/GTelnet.desktop
-share/gnome/pixmaps/gnome-telnet.png
-share/gnome/pixmaps/gnome-telnet/gtelnet_bg_black.jpg
-share/gnome/pixmaps/gnome-telnet/gtelnet_bg_brown.jpg
share/locale/de/LC_MESSAGES/gnome-telnet.mo
share/locale/ja/LC_MESSAGES/gnome-telnet.mo
share/locale/sl/LC_MESSAGES/gnome-telnet.mo
-@dirrm share/gnome/pixmaps/gnome-telnet
+share/pixmaps/gnome-telnet.png
+share/pixmaps/gnome-telnet/gtelnet_bg_black.jpg
+share/pixmaps/gnome-telnet/gtelnet_bg_brown.jpg
+@dirrm share/pixmaps/gnome-telnet
diff --git a/net/grdesktop/Makefile b/net/grdesktop/Makefile
index b686cb551382..ac48ed74160b 100644
--- a/net/grdesktop/Makefile
+++ b/net/grdesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grdesktop
PORTVERSION= 0.23
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -32,6 +32,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in
post-install:
- @${INSTALL_DATA} ${PREFIX}/share/gnome/pixmaps/grdesktop/icon.png ${PREFIX}/share/gnome/pixmaps/grdesktop.png
+ @${INSTALL_DATA} ${PREFIX}/share/pixmaps/grdesktop/icon.png ${PREFIX}/share/pixmaps/grdesktop.png
.include <bsd.port.mk>
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index db5c067d03fb..daca75f736a0 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -1,32 +1,33 @@
bin/grdesktop
-share/gnome/application-registry/grdesktop.applications
-share/gnome/applications/grdesktop.desktop
+share/application-registry/grdesktop.applications
+share/applications/grdesktop.desktop
share/gnome/help/grdesktop/C/grdesktop.xml
share/gnome/help/grdesktop/C/legal.xml
-share/gnome/mime-info/grdesktop.keys
-share/gnome/mime-info/grdesktop.mime
-share/gnome/omf/grdesktop/grdesktop-C.omf
-share/gnome/pixmaps/grdesktop/animation.gif
-share/gnome/pixmaps/grdesktop/colors_1.png
-share/gnome/pixmaps/grdesktop/colors_2.png
-share/gnome/pixmaps/grdesktop/colors_3.png
-share/gnome/pixmaps/grdesktop/colors_4.png
-share/gnome/pixmaps/grdesktop/folder.png
-share/gnome/pixmaps/grdesktop/host.png
-share/gnome/pixmaps/grdesktop/icon.png
-share/gnome/pixmaps/grdesktop/icon.xpm
-share/gnome/pixmaps/grdesktop/keyboard.png
-share/gnome/pixmaps/grdesktop/monitor.png
-share/gnome/pixmaps/grdesktop/program.png
-share/gnome/pixmaps/grdesktop/settings.png
-share/gnome/pixmaps/grdesktop/sound.png
-share/gnome/pixmaps/grdesktop/topimage.png
-share/gnome/pixmaps/grdesktop/topimage2.png
-share/gnome/pixmaps/grdesktop.png
+share/mime-info/grdesktop.keys
+share/mime-info/grdesktop.mime
+share/omf/grdesktop/grdesktop-C.omf
+share/pixmaps/grdesktop/animation.gif
+share/pixmaps/grdesktop/colors_1.png
+share/pixmaps/grdesktop/colors_2.png
+share/pixmaps/grdesktop/colors_3.png
+share/pixmaps/grdesktop/colors_4.png
+share/pixmaps/grdesktop/folder.png
+share/pixmaps/grdesktop/host.png
+share/pixmaps/grdesktop/icon.png
+share/pixmaps/grdesktop/icon.xpm
+share/pixmaps/grdesktop/keyboard.png
+share/pixmaps/grdesktop/monitor.png
+share/pixmaps/grdesktop/program.png
+share/pixmaps/grdesktop/settings.png
+share/pixmaps/grdesktop/sound.png
+share/pixmaps/grdesktop/topimage.png
+share/pixmaps/grdesktop/topimage2.png
+share/pixmaps/grdesktop.png
share/locale/de/LC_MESSAGES/grdesktop.mo
share/locale/es/LC_MESSAGES/grdesktop.mo
share/locale/fr/LC_MESSAGES/grdesktop.mo
-@dirrm share/gnome/pixmaps/grdesktop
-@dirrm share/gnome/omf/grdesktop
+@dirrm share/pixmaps/grdesktop
+@dirrm share/omf/grdesktop
@dirrm share/gnome/help/grdesktop/C
@dirrm share/gnome/help/grdesktop
+@dirrmtry share/applications
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 9b81041d9aa8..f88bc70c84f2 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.4.5b
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= liferea
@@ -17,7 +18,7 @@ COMMENT= Simple RSS/RDF feed reader
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
USE_GECKO= mozilla firefox
-USE_GNOME= gnomeprefix gnomehack libgtkhtml
+USE_GNOME= gnomeprefix gnomehack libgtkhtml libglade2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index ba1caf1d9bab..2922c74f7598 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -9,120 +9,120 @@ lib/liferea/liblihtmlg.so
%%NOTIFY%%lib/liferea/liblinotiflibnotify.la
%%NOTIFY%%lib/liferea/liblinotiflibnotify.so
%%NOTIFY%%lib/liferea/liblinotiflibnotify.so.0
-share/gnome/applications/liferea.desktop
-share/gnome/liferea/bloglines_source.glade
-share/gnome/liferea/google_source.glade
-share/gnome/liferea/liferea.glade
-share/gnome/liferea/node_source.glade
-share/gnome/liferea/opml_source.glade
-share/gnome/liferea/css/adblock.css
-share/gnome/liferea/css/liferea.css
-share/gnome/liferea/doc/html/about_de.html
-share/gnome/liferea/doc/html/about_en.html
-share/gnome/liferea/doc/html/concepts_de.html
-share/gnome/liferea/doc/html/concepts_en.html
-share/gnome/liferea/doc/html/enclosures_de.html
-share/gnome/liferea/doc/html/enclosures_en.html
-share/gnome/liferea/doc/html/faq_de.html
-share/gnome/liferea/doc/html/faq_en.html
-share/gnome/liferea/doc/html/faq_ja.html
-share/gnome/liferea/doc/html/folders_de.html
-share/gnome/liferea/doc/html/folders_en.html
-share/gnome/liferea/doc/html/headlines_de.html
-share/gnome/liferea/doc/html/headlines_en.html
-share/gnome/liferea/doc/html/help_feed_default.png
-share/gnome/liferea/doc/html/help_feed_error.png
-share/gnome/liferea/doc/html/help_feed_prop_adv_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_cache_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_downl_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_general_1.4.0.png
-share/gnome/liferea/doc/html/help_feed_prop_source_1.4.0.png
-share/gnome/liferea/doc/html/help_folder.png
-share/gnome/liferea/doc/html/help_item_flag.png
-share/gnome/liferea/doc/html/help_item_unread.png
-share/gnome/liferea/doc/html/help_opml.png
-share/gnome/liferea/doc/html/help_prefs_browser_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_enclosures_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_feeds_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_folders_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_gui_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_headlines_1.4.0.png
-share/gnome/liferea/doc/html/help_prefs_proxy_1.4.0.png
-share/gnome/liferea/doc/html/help_search_1.4.0.png
-share/gnome/liferea/doc/html/help_source_add_1.4.0.png
-share/gnome/liferea/doc/html/help_subscribe_1.4.0.png
-share/gnome/liferea/doc/html/help_vfolder_1.4.0.png
-share/gnome/liferea/doc/html/newsbin_de.html
-share/gnome/liferea/doc/html/newsbin_en.html
-share/gnome/liferea/doc/html/preferences_de.html
-share/gnome/liferea/doc/html/preferences_en.html
-share/gnome/liferea/doc/html/reference.css
-share/gnome/liferea/doc/html/reference_de.html
-share/gnome/liferea/doc/html/reference_en.html
-share/gnome/liferea/doc/html/reference_ja.html
-share/gnome/liferea/doc/html/reference_nl.html
-share/gnome/liferea/doc/html/searching_de.html
-share/gnome/liferea/doc/html/searching_en.html
-share/gnome/liferea/doc/html/subscriptions_de.html
-share/gnome/liferea/doc/html/subscriptions_en.html
-share/gnome/liferea/doc/html/topics_de.html
-share/gnome/liferea/doc/html/topics_en.html
-share/gnome/liferea/doc/html/topics_ja.html
-share/gnome/liferea/doc/html/updating_de.html
-share/gnome/liferea/doc/html/updating_en.html
-share/gnome/liferea/dtd/html.ent
-share/gnome/liferea/media/xspf_license.txt
-share/gnome/liferea/media/xspf_player_slim.swf
-share/gnome/liferea/opml/feedlist.opml
-share/gnome/liferea/opml/feedlist_ca.opml
-share/gnome/liferea/opml/feedlist_de.opml
-share/gnome/liferea/opml/feedlist_es.opml
-share/gnome/liferea/opml/feedlist_eu.opml
-share/gnome/liferea/opml/feedlist_fr.opml
-share/gnome/liferea/opml/feedlist_nl.opml
-share/gnome/liferea/opml/feedlist_pl.opml
-share/gnome/liferea/opml/feedlist_sk.opml
-share/gnome/liferea/opml/feedlist_sv.opml
-share/gnome/liferea/opml/feedlist_tr.opml
-share/gnome/liferea/pixmaps/arrow.png
-share/gnome/liferea/pixmaps/attachment.png
-share/gnome/liferea/pixmaps/available.png
-share/gnome/liferea/pixmaps/available_offline.png
-share/gnome/liferea/pixmaps/bookmark.png
-share/gnome/liferea/pixmaps/comments.png
-share/gnome/liferea/pixmaps/default.png
-share/gnome/liferea/pixmaps/directory.png
-share/gnome/liferea/pixmaps/edit.png
-share/gnome/liferea/pixmaps/empty.png
-share/gnome/liferea/pixmaps/empty_offline.png
-share/gnome/liferea/pixmaps/fl_bloglines.png
-share/gnome/liferea/pixmaps/fl_google.png
-share/gnome/liferea/pixmaps/fl_opml.png
-share/gnome/liferea/pixmaps/flag.png
-share/gnome/liferea/pixmaps/grayflag.png
-share/gnome/liferea/pixmaps/liferea.png
-share/gnome/liferea/pixmaps/newsbin.png
-share/gnome/liferea/pixmaps/ocs.png
-share/gnome/liferea/pixmaps/offline.png
-share/gnome/liferea/pixmaps/online.png
-share/gnome/liferea/pixmaps/read.xpm
-share/gnome/liferea/pixmaps/tag.png
-share/gnome/liferea/pixmaps/technorati.png
-share/gnome/liferea/pixmaps/unread.png
-share/gnome/liferea/pixmaps/vfolder.png
-share/gnome/liferea/xslt/feed.xml
-share/gnome/liferea/xslt/feed.xml.in
-share/gnome/liferea/xslt/folder.xml
-share/gnome/liferea/xslt/folder.xml.in
-share/gnome/liferea/xslt/item.xml
-share/gnome/liferea/xslt/item.xml.in
-share/gnome/liferea/xslt/i18n-filter.xslt
-share/gnome/liferea/xslt/newsbin.xml
-share/gnome/liferea/xslt/newsbin.xml.in
-share/gnome/liferea/xslt/source.xml
-share/gnome/liferea/xslt/source.xml.in
-share/gnome/liferea/xslt/vfolder.xml
-share/gnome/liferea/xslt/vfolder.xml.in
+share/applications/liferea.desktop
+share/liferea/bloglines_source.glade
+share/liferea/google_source.glade
+share/liferea/liferea.glade
+share/liferea/node_source.glade
+share/liferea/opml_source.glade
+share/liferea/css/adblock.css
+share/liferea/css/liferea.css
+share/liferea/doc/html/about_de.html
+share/liferea/doc/html/about_en.html
+share/liferea/doc/html/concepts_de.html
+share/liferea/doc/html/concepts_en.html
+share/liferea/doc/html/enclosures_de.html
+share/liferea/doc/html/enclosures_en.html
+share/liferea/doc/html/faq_de.html
+share/liferea/doc/html/faq_en.html
+share/liferea/doc/html/faq_ja.html
+share/liferea/doc/html/folders_de.html
+share/liferea/doc/html/folders_en.html
+share/liferea/doc/html/headlines_de.html
+share/liferea/doc/html/headlines_en.html
+share/liferea/doc/html/help_feed_default.png
+share/liferea/doc/html/help_feed_error.png
+share/liferea/doc/html/help_feed_prop_adv_1.4.0.png
+share/liferea/doc/html/help_feed_prop_cache_1.4.0.png
+share/liferea/doc/html/help_feed_prop_downl_1.4.0.png
+share/liferea/doc/html/help_feed_prop_general_1.4.0.png
+share/liferea/doc/html/help_feed_prop_source_1.4.0.png
+share/liferea/doc/html/help_folder.png
+share/liferea/doc/html/help_item_flag.png
+share/liferea/doc/html/help_item_unread.png
+share/liferea/doc/html/help_opml.png
+share/liferea/doc/html/help_prefs_browser_1.4.0.png
+share/liferea/doc/html/help_prefs_enclosures_1.4.0.png
+share/liferea/doc/html/help_prefs_feeds_1.4.0.png
+share/liferea/doc/html/help_prefs_folders_1.4.0.png
+share/liferea/doc/html/help_prefs_gui_1.4.0.png
+share/liferea/doc/html/help_prefs_headlines_1.4.0.png
+share/liferea/doc/html/help_prefs_proxy_1.4.0.png
+share/liferea/doc/html/help_search_1.4.0.png
+share/liferea/doc/html/help_source_add_1.4.0.png
+share/liferea/doc/html/help_subscribe_1.4.0.png
+share/liferea/doc/html/help_vfolder_1.4.0.png
+share/liferea/doc/html/newsbin_de.html
+share/liferea/doc/html/newsbin_en.html
+share/liferea/doc/html/preferences_de.html
+share/liferea/doc/html/preferences_en.html
+share/liferea/doc/html/reference.css
+share/liferea/doc/html/reference_de.html
+share/liferea/doc/html/reference_en.html
+share/liferea/doc/html/reference_ja.html
+share/liferea/doc/html/reference_nl.html
+share/liferea/doc/html/searching_de.html
+share/liferea/doc/html/searching_en.html
+share/liferea/doc/html/subscriptions_de.html
+share/liferea/doc/html/subscriptions_en.html
+share/liferea/doc/html/topics_de.html
+share/liferea/doc/html/topics_en.html
+share/liferea/doc/html/topics_ja.html
+share/liferea/doc/html/updating_de.html
+share/liferea/doc/html/updating_en.html
+share/liferea/dtd/html.ent
+share/liferea/media/xspf_license.txt
+share/liferea/media/xspf_player_slim.swf
+share/liferea/opml/feedlist.opml
+share/liferea/opml/feedlist_ca.opml
+share/liferea/opml/feedlist_de.opml
+share/liferea/opml/feedlist_es.opml
+share/liferea/opml/feedlist_eu.opml
+share/liferea/opml/feedlist_fr.opml
+share/liferea/opml/feedlist_nl.opml
+share/liferea/opml/feedlist_pl.opml
+share/liferea/opml/feedlist_sk.opml
+share/liferea/opml/feedlist_sv.opml
+share/liferea/opml/feedlist_tr.opml
+share/liferea/pixmaps/arrow.png
+share/liferea/pixmaps/attachment.png
+share/liferea/pixmaps/available.png
+share/liferea/pixmaps/available_offline.png
+share/liferea/pixmaps/bookmark.png
+share/liferea/pixmaps/comments.png
+share/liferea/pixmaps/default.png
+share/liferea/pixmaps/directory.png
+share/liferea/pixmaps/edit.png
+share/liferea/pixmaps/empty.png
+share/liferea/pixmaps/empty_offline.png
+share/liferea/pixmaps/fl_bloglines.png
+share/liferea/pixmaps/fl_google.png
+share/liferea/pixmaps/fl_opml.png
+share/liferea/pixmaps/flag.png
+share/liferea/pixmaps/grayflag.png
+share/liferea/pixmaps/liferea.png
+share/liferea/pixmaps/newsbin.png
+share/liferea/pixmaps/ocs.png
+share/liferea/pixmaps/offline.png
+share/liferea/pixmaps/online.png
+share/liferea/pixmaps/read.xpm
+share/liferea/pixmaps/tag.png
+share/liferea/pixmaps/technorati.png
+share/liferea/pixmaps/unread.png
+share/liferea/pixmaps/vfolder.png
+share/liferea/xslt/feed.xml
+share/liferea/xslt/feed.xml.in
+share/liferea/xslt/folder.xml
+share/liferea/xslt/folder.xml.in
+share/liferea/xslt/item.xml
+share/liferea/xslt/item.xml.in
+share/liferea/xslt/i18n-filter.xslt
+share/liferea/xslt/newsbin.xml
+share/liferea/xslt/newsbin.xml.in
+share/liferea/xslt/source.xml
+share/liferea/xslt/source.xml.in
+share/liferea/xslt/vfolder.xml
+share/liferea/xslt/vfolder.xml.in
share/icons/hicolor/48x48/apps/liferea.png
share/locale/ar/LC_MESSAGES/liferea.mo
share/locale/be@latin/LC_MESSAGES/liferea.mo
@@ -138,15 +138,16 @@ share/locale/pt_BR/LC_MESSAGES/liferea.mo
share/locale/ru/LC_MESSAGES/liferea.mo
share/locale/sv/LC_MESSAGES/liferea.mo
share/locale/tr/LC_MESSAGES/liferea.mo
-@dirrm share/gnome/liferea/xslt
-@dirrm share/gnome/liferea/pixmaps
-@dirrm share/gnome/liferea/opml
-@dirrm share/gnome/liferea/media
-@dirrm share/gnome/liferea/dtd
-@dirrm share/gnome/liferea/doc/html
-@dirrm share/gnome/liferea/doc
-@dirrm share/gnome/liferea/css
-@dirrm share/gnome/liferea
+@dirrm share/liferea/xslt
+@dirrm share/liferea/pixmaps
+@dirrm share/liferea/opml
+@dirrm share/liferea/media
+@dirrm share/liferea/dtd
+@dirrm share/liferea/doc/html
+@dirrm share/liferea/doc
+@dirrm share/liferea/css
+@dirrm share/liferea
@dirrmtry man/pl/man1
@dirrmtry man/pl
@dirrm lib/liferea
+@dirrmtry share/applications
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index de2eddd92869..107279bb2d28 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= link-monitor-applet
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= link-monitor
diff --git a/net/link-monitor-applet/pkg-plist b/net/link-monitor-applet/pkg-plist
index e751e15183c5..28f7e5f02e9e 100644
--- a/net/link-monitor-applet/pkg-plist
+++ b/net/link-monitor-applet/pkg-plist
@@ -1,226 +1,226 @@
libdata/bonobo/servers/GNOME_LinkMonitorApplet.server
libexec/link-monitor-applet
-share/gnome/gnome-2.0/ui/GNOME_LinkMonitorApplet.xml
+share/gnome-2.0/ui/GNOME_LinkMonitorApplet.xml
share/gnome/help/link-monitor-applet/C/documentation-license.xml
share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-5hosts.png
share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-empty.png
share/gnome/help/link-monitor-applet/C/link-monitor-applet.xml
share/gnome/help/link-monitor-applet/C/software-license.xml
-share/gnome/link-monitor-applet/flags/ad.svg
-share/gnome/link-monitor-applet/flags/ae.svg
-share/gnome/link-monitor-applet/flags/af.svg
-share/gnome/link-monitor-applet/flags/ag.svg
-share/gnome/link-monitor-applet/flags/ai.svg
-share/gnome/link-monitor-applet/flags/al.svg
-share/gnome/link-monitor-applet/flags/am.svg
-share/gnome/link-monitor-applet/flags/an.svg
-share/gnome/link-monitor-applet/flags/ao.svg
-share/gnome/link-monitor-applet/flags/ar.svg
-share/gnome/link-monitor-applet/flags/as.svg
-share/gnome/link-monitor-applet/flags/at.svg
-share/gnome/link-monitor-applet/flags/au.svg
-share/gnome/link-monitor-applet/flags/aw.svg
-share/gnome/link-monitor-applet/flags/az.svg
-share/gnome/link-monitor-applet/flags/ba.svg
-share/gnome/link-monitor-applet/flags/bb.svg
-share/gnome/link-monitor-applet/flags/bd.svg
-share/gnome/link-monitor-applet/flags/be.svg
-share/gnome/link-monitor-applet/flags/bf.svg
-share/gnome/link-monitor-applet/flags/bg.svg
-share/gnome/link-monitor-applet/flags/bh.svg
-share/gnome/link-monitor-applet/flags/bi.svg
-share/gnome/link-monitor-applet/flags/bj.svg
-share/gnome/link-monitor-applet/flags/bn.svg
-share/gnome/link-monitor-applet/flags/bo.svg
-share/gnome/link-monitor-applet/flags/br.svg
-share/gnome/link-monitor-applet/flags/bs.svg
-share/gnome/link-monitor-applet/flags/bt.svg
-share/gnome/link-monitor-applet/flags/bw.svg
-share/gnome/link-monitor-applet/flags/by.svg
-share/gnome/link-monitor-applet/flags/bz.svg
-share/gnome/link-monitor-applet/flags/ca.svg
-share/gnome/link-monitor-applet/flags/cd.svg
-share/gnome/link-monitor-applet/flags/cf.svg
-share/gnome/link-monitor-applet/flags/cg.svg
-share/gnome/link-monitor-applet/flags/ch.svg
-share/gnome/link-monitor-applet/flags/ci.svg
-share/gnome/link-monitor-applet/flags/ck.svg
-share/gnome/link-monitor-applet/flags/cl.svg
-share/gnome/link-monitor-applet/flags/cm.svg
-share/gnome/link-monitor-applet/flags/cn.svg
-share/gnome/link-monitor-applet/flags/co.svg
-share/gnome/link-monitor-applet/flags/cr.svg
-share/gnome/link-monitor-applet/flags/cs.svg
-share/gnome/link-monitor-applet/flags/cu.svg
-share/gnome/link-monitor-applet/flags/cv.svg
-share/gnome/link-monitor-applet/flags/cx.svg
-share/gnome/link-monitor-applet/flags/cy.svg
-share/gnome/link-monitor-applet/flags/cz.svg
-share/gnome/link-monitor-applet/flags/de.svg
-share/gnome/link-monitor-applet/flags/dj.svg
-share/gnome/link-monitor-applet/flags/dk.svg
-share/gnome/link-monitor-applet/flags/dm.svg
-share/gnome/link-monitor-applet/flags/do.svg
-share/gnome/link-monitor-applet/flags/dz.svg
-share/gnome/link-monitor-applet/flags/ec.svg
-share/gnome/link-monitor-applet/flags/ee.svg
-share/gnome/link-monitor-applet/flags/eg.svg
-share/gnome/link-monitor-applet/flags/eh.svg
-share/gnome/link-monitor-applet/flags/er.svg
-share/gnome/link-monitor-applet/flags/es.svg
-share/gnome/link-monitor-applet/flags/et.svg
-share/gnome/link-monitor-applet/flags/fi.svg
-share/gnome/link-monitor-applet/flags/fj.svg
-share/gnome/link-monitor-applet/flags/fm.svg
-share/gnome/link-monitor-applet/flags/fr.svg
-share/gnome/link-monitor-applet/flags/ga.svg
-share/gnome/link-monitor-applet/flags/gb.svg
-share/gnome/link-monitor-applet/flags/gd.svg
-share/gnome/link-monitor-applet/flags/ge.svg
-share/gnome/link-monitor-applet/flags/gh.svg
-share/gnome/link-monitor-applet/flags/gm.svg
-share/gnome/link-monitor-applet/flags/gn.svg
-share/gnome/link-monitor-applet/flags/gq.svg
-share/gnome/link-monitor-applet/flags/gr.svg
-share/gnome/link-monitor-applet/flags/gs.svg
-share/gnome/link-monitor-applet/flags/gt.svg
-share/gnome/link-monitor-applet/flags/gu.svg
-share/gnome/link-monitor-applet/flags/gw.svg
-share/gnome/link-monitor-applet/flags/gy.svg
-share/gnome/link-monitor-applet/flags/hn.svg
-share/gnome/link-monitor-applet/flags/hr.svg
-share/gnome/link-monitor-applet/flags/ht.svg
-share/gnome/link-monitor-applet/flags/hu.svg
-share/gnome/link-monitor-applet/flags/id.svg
-share/gnome/link-monitor-applet/flags/ie.svg
-share/gnome/link-monitor-applet/flags/il.svg
-share/gnome/link-monitor-applet/flags/in.svg
-share/gnome/link-monitor-applet/flags/iq.svg
-share/gnome/link-monitor-applet/flags/ir.svg
-share/gnome/link-monitor-applet/flags/is.svg
-share/gnome/link-monitor-applet/flags/it.svg
-share/gnome/link-monitor-applet/flags/jm.svg
-share/gnome/link-monitor-applet/flags/jo.svg
-share/gnome/link-monitor-applet/flags/jp.svg
-share/gnome/link-monitor-applet/flags/ke.svg
-share/gnome/link-monitor-applet/flags/kg.svg
-share/gnome/link-monitor-applet/flags/kh.svg
-share/gnome/link-monitor-applet/flags/ki.svg
-share/gnome/link-monitor-applet/flags/km.svg
-share/gnome/link-monitor-applet/flags/kn.svg
-share/gnome/link-monitor-applet/flags/kp.svg
-share/gnome/link-monitor-applet/flags/kr.svg
-share/gnome/link-monitor-applet/flags/kw.svg
-share/gnome/link-monitor-applet/flags/kz.svg
-share/gnome/link-monitor-applet/flags/la.svg
-share/gnome/link-monitor-applet/flags/lb.svg
-share/gnome/link-monitor-applet/flags/lc.svg
-share/gnome/link-monitor-applet/flags/li.svg
-share/gnome/link-monitor-applet/flags/lk.svg
-share/gnome/link-monitor-applet/flags/lr.svg
-share/gnome/link-monitor-applet/flags/ls.svg
-share/gnome/link-monitor-applet/flags/lt.svg
-share/gnome/link-monitor-applet/flags/lu.svg
-share/gnome/link-monitor-applet/flags/lv.svg
-share/gnome/link-monitor-applet/flags/ly.svg
-share/gnome/link-monitor-applet/flags/ma.svg
-share/gnome/link-monitor-applet/flags/mc.svg
-share/gnome/link-monitor-applet/flags/md.svg
-share/gnome/link-monitor-applet/flags/mg.svg
-share/gnome/link-monitor-applet/flags/mh.svg
-share/gnome/link-monitor-applet/flags/mk.svg
-share/gnome/link-monitor-applet/flags/ml.svg
-share/gnome/link-monitor-applet/flags/mm.svg
-share/gnome/link-monitor-applet/flags/mn.svg
-share/gnome/link-monitor-applet/flags/mp.svg
-share/gnome/link-monitor-applet/flags/mr.svg
-share/gnome/link-monitor-applet/flags/ms.svg
-share/gnome/link-monitor-applet/flags/mt.svg
-share/gnome/link-monitor-applet/flags/mu.svg
-share/gnome/link-monitor-applet/flags/mv.svg
-share/gnome/link-monitor-applet/flags/mw.svg
-share/gnome/link-monitor-applet/flags/mx.svg
-share/gnome/link-monitor-applet/flags/my.svg
-share/gnome/link-monitor-applet/flags/mz.svg
-share/gnome/link-monitor-applet/flags/na.svg
-share/gnome/link-monitor-applet/flags/ne.svg
-share/gnome/link-monitor-applet/flags/ng.svg
-share/gnome/link-monitor-applet/flags/ni.svg
-share/gnome/link-monitor-applet/flags/nl.svg
-share/gnome/link-monitor-applet/flags/no.svg
-share/gnome/link-monitor-applet/flags/np.svg
-share/gnome/link-monitor-applet/flags/nr.svg
-share/gnome/link-monitor-applet/flags/nu.svg
-share/gnome/link-monitor-applet/flags/nz.svg
-share/gnome/link-monitor-applet/flags/om.svg
-share/gnome/link-monitor-applet/flags/pa.svg
-share/gnome/link-monitor-applet/flags/pe.svg
-share/gnome/link-monitor-applet/flags/pg.svg
-share/gnome/link-monitor-applet/flags/ph.svg
-share/gnome/link-monitor-applet/flags/pk.svg
-share/gnome/link-monitor-applet/flags/pl.svg
-share/gnome/link-monitor-applet/flags/pn.svg
-share/gnome/link-monitor-applet/flags/pr.svg
-share/gnome/link-monitor-applet/flags/pt.svg
-share/gnome/link-monitor-applet/flags/pw.svg
-share/gnome/link-monitor-applet/flags/py.svg
-share/gnome/link-monitor-applet/flags/qa.svg
-share/gnome/link-monitor-applet/flags/ro.svg
-share/gnome/link-monitor-applet/flags/ru.svg
-share/gnome/link-monitor-applet/flags/rw.svg
-share/gnome/link-monitor-applet/flags/sa.svg
-share/gnome/link-monitor-applet/flags/sb.svg
-share/gnome/link-monitor-applet/flags/sc.svg
-share/gnome/link-monitor-applet/flags/sd.svg
-share/gnome/link-monitor-applet/flags/se.svg
-share/gnome/link-monitor-applet/flags/sg.svg
-share/gnome/link-monitor-applet/flags/si.svg
-share/gnome/link-monitor-applet/flags/sk.svg
-share/gnome/link-monitor-applet/flags/sl.svg
-share/gnome/link-monitor-applet/flags/sm.svg
-share/gnome/link-monitor-applet/flags/sn.svg
-share/gnome/link-monitor-applet/flags/so.svg
-share/gnome/link-monitor-applet/flags/sr.svg
-share/gnome/link-monitor-applet/flags/st.svg
-share/gnome/link-monitor-applet/flags/sv.svg
-share/gnome/link-monitor-applet/flags/sy.svg
-share/gnome/link-monitor-applet/flags/sz.svg
-share/gnome/link-monitor-applet/flags/td.svg
-share/gnome/link-monitor-applet/flags/tg.svg
-share/gnome/link-monitor-applet/flags/th.svg
-share/gnome/link-monitor-applet/flags/tj.svg
-share/gnome/link-monitor-applet/flags/tk.svg
-share/gnome/link-monitor-applet/flags/tm.svg
-share/gnome/link-monitor-applet/flags/tn.svg
-share/gnome/link-monitor-applet/flags/to.svg
-share/gnome/link-monitor-applet/flags/tp.svg
-share/gnome/link-monitor-applet/flags/tr.svg
-share/gnome/link-monitor-applet/flags/tt.svg
-share/gnome/link-monitor-applet/flags/tv.svg
-share/gnome/link-monitor-applet/flags/tz.svg
-share/gnome/link-monitor-applet/flags/ua.svg
-share/gnome/link-monitor-applet/flags/ug.svg
-share/gnome/link-monitor-applet/flags/us.svg
-share/gnome/link-monitor-applet/flags/uy.svg
-share/gnome/link-monitor-applet/flags/uz.svg
-share/gnome/link-monitor-applet/flags/va.svg
-share/gnome/link-monitor-applet/flags/vc.svg
-share/gnome/link-monitor-applet/flags/ve.svg
-share/gnome/link-monitor-applet/flags/vn.svg
-share/gnome/link-monitor-applet/flags/vu.svg
-share/gnome/link-monitor-applet/flags/ws.svg
-share/gnome/link-monitor-applet/flags/ye.svg
-share/gnome/link-monitor-applet/flags/za.svg
-share/gnome/link-monitor-applet/flags/zm.svg
-share/gnome/link-monitor-applet/flags/zw.svg
-share/gnome/link-monitor-applet/ui/preferences-dialog.glade
-share/gnome/omf/link-monitor-applet/link-monitor-applet-C.omf
-share/gnome/pixmaps/link-monitor-applet.png
+share/link-monitor-applet/flags/ad.svg
+share/link-monitor-applet/flags/ae.svg
+share/link-monitor-applet/flags/af.svg
+share/link-monitor-applet/flags/ag.svg
+share/link-monitor-applet/flags/ai.svg
+share/link-monitor-applet/flags/al.svg
+share/link-monitor-applet/flags/am.svg
+share/link-monitor-applet/flags/an.svg
+share/link-monitor-applet/flags/ao.svg
+share/link-monitor-applet/flags/ar.svg
+share/link-monitor-applet/flags/as.svg
+share/link-monitor-applet/flags/at.svg
+share/link-monitor-applet/flags/au.svg
+share/link-monitor-applet/flags/aw.svg
+share/link-monitor-applet/flags/az.svg
+share/link-monitor-applet/flags/ba.svg
+share/link-monitor-applet/flags/bb.svg
+share/link-monitor-applet/flags/bd.svg
+share/link-monitor-applet/flags/be.svg
+share/link-monitor-applet/flags/bf.svg
+share/link-monitor-applet/flags/bg.svg
+share/link-monitor-applet/flags/bh.svg
+share/link-monitor-applet/flags/bi.svg
+share/link-monitor-applet/flags/bj.svg
+share/link-monitor-applet/flags/bn.svg
+share/link-monitor-applet/flags/bo.svg
+share/link-monitor-applet/flags/br.svg
+share/link-monitor-applet/flags/bs.svg
+share/link-monitor-applet/flags/bt.svg
+share/link-monitor-applet/flags/bw.svg
+share/link-monitor-applet/flags/by.svg
+share/link-monitor-applet/flags/bz.svg
+share/link-monitor-applet/flags/ca.svg
+share/link-monitor-applet/flags/cd.svg
+share/link-monitor-applet/flags/cf.svg
+share/link-monitor-applet/flags/cg.svg
+share/link-monitor-applet/flags/ch.svg
+share/link-monitor-applet/flags/ci.svg
+share/link-monitor-applet/flags/ck.svg
+share/link-monitor-applet/flags/cl.svg
+share/link-monitor-applet/flags/cm.svg
+share/link-monitor-applet/flags/cn.svg
+share/link-monitor-applet/flags/co.svg
+share/link-monitor-applet/flags/cr.svg
+share/link-monitor-applet/flags/cs.svg
+share/link-monitor-applet/flags/cu.svg
+share/link-monitor-applet/flags/cv.svg
+share/link-monitor-applet/flags/cx.svg
+share/link-monitor-applet/flags/cy.svg
+share/link-monitor-applet/flags/cz.svg
+share/link-monitor-applet/flags/de.svg
+share/link-monitor-applet/flags/dj.svg
+share/link-monitor-applet/flags/dk.svg
+share/link-monitor-applet/flags/dm.svg
+share/link-monitor-applet/flags/do.svg
+share/link-monitor-applet/flags/dz.svg
+share/link-monitor-applet/flags/ec.svg
+share/link-monitor-applet/flags/ee.svg
+share/link-monitor-applet/flags/eg.svg
+share/link-monitor-applet/flags/eh.svg
+share/link-monitor-applet/flags/er.svg
+share/link-monitor-applet/flags/es.svg
+share/link-monitor-applet/flags/et.svg
+share/link-monitor-applet/flags/fi.svg
+share/link-monitor-applet/flags/fj.svg
+share/link-monitor-applet/flags/fm.svg
+share/link-monitor-applet/flags/fr.svg
+share/link-monitor-applet/flags/ga.svg
+share/link-monitor-applet/flags/gb.svg
+share/link-monitor-applet/flags/gd.svg
+share/link-monitor-applet/flags/ge.svg
+share/link-monitor-applet/flags/gh.svg
+share/link-monitor-applet/flags/gm.svg
+share/link-monitor-applet/flags/gn.svg
+share/link-monitor-applet/flags/gq.svg
+share/link-monitor-applet/flags/gr.svg
+share/link-monitor-applet/flags/gs.svg
+share/link-monitor-applet/flags/gt.svg
+share/link-monitor-applet/flags/gu.svg
+share/link-monitor-applet/flags/gw.svg
+share/link-monitor-applet/flags/gy.svg
+share/link-monitor-applet/flags/hn.svg
+share/link-monitor-applet/flags/hr.svg
+share/link-monitor-applet/flags/ht.svg
+share/link-monitor-applet/flags/hu.svg
+share/link-monitor-applet/flags/id.svg
+share/link-monitor-applet/flags/ie.svg
+share/link-monitor-applet/flags/il.svg
+share/link-monitor-applet/flags/in.svg
+share/link-monitor-applet/flags/iq.svg
+share/link-monitor-applet/flags/ir.svg
+share/link-monitor-applet/flags/is.svg
+share/link-monitor-applet/flags/it.svg
+share/link-monitor-applet/flags/jm.svg
+share/link-monitor-applet/flags/jo.svg
+share/link-monitor-applet/flags/jp.svg
+share/link-monitor-applet/flags/ke.svg
+share/link-monitor-applet/flags/kg.svg
+share/link-monitor-applet/flags/kh.svg
+share/link-monitor-applet/flags/ki.svg
+share/link-monitor-applet/flags/km.svg
+share/link-monitor-applet/flags/kn.svg
+share/link-monitor-applet/flags/kp.svg
+share/link-monitor-applet/flags/kr.svg
+share/link-monitor-applet/flags/kw.svg
+share/link-monitor-applet/flags/kz.svg
+share/link-monitor-applet/flags/la.svg
+share/link-monitor-applet/flags/lb.svg
+share/link-monitor-applet/flags/lc.svg
+share/link-monitor-applet/flags/li.svg
+share/link-monitor-applet/flags/lk.svg
+share/link-monitor-applet/flags/lr.svg
+share/link-monitor-applet/flags/ls.svg
+share/link-monitor-applet/flags/lt.svg
+share/link-monitor-applet/flags/lu.svg
+share/link-monitor-applet/flags/lv.svg
+share/link-monitor-applet/flags/ly.svg
+share/link-monitor-applet/flags/ma.svg
+share/link-monitor-applet/flags/mc.svg
+share/link-monitor-applet/flags/md.svg
+share/link-monitor-applet/flags/mg.svg
+share/link-monitor-applet/flags/mh.svg
+share/link-monitor-applet/flags/mk.svg
+share/link-monitor-applet/flags/ml.svg
+share/link-monitor-applet/flags/mm.svg
+share/link-monitor-applet/flags/mn.svg
+share/link-monitor-applet/flags/mp.svg
+share/link-monitor-applet/flags/mr.svg
+share/link-monitor-applet/flags/ms.svg
+share/link-monitor-applet/flags/mt.svg
+share/link-monitor-applet/flags/mu.svg
+share/link-monitor-applet/flags/mv.svg
+share/link-monitor-applet/flags/mw.svg
+share/link-monitor-applet/flags/mx.svg
+share/link-monitor-applet/flags/my.svg
+share/link-monitor-applet/flags/mz.svg
+share/link-monitor-applet/flags/na.svg
+share/link-monitor-applet/flags/ne.svg
+share/link-monitor-applet/flags/ng.svg
+share/link-monitor-applet/flags/ni.svg
+share/link-monitor-applet/flags/nl.svg
+share/link-monitor-applet/flags/no.svg
+share/link-monitor-applet/flags/np.svg
+share/link-monitor-applet/flags/nr.svg
+share/link-monitor-applet/flags/nu.svg
+share/link-monitor-applet/flags/nz.svg
+share/link-monitor-applet/flags/om.svg
+share/link-monitor-applet/flags/pa.svg
+share/link-monitor-applet/flags/pe.svg
+share/link-monitor-applet/flags/pg.svg
+share/link-monitor-applet/flags/ph.svg
+share/link-monitor-applet/flags/pk.svg
+share/link-monitor-applet/flags/pl.svg
+share/link-monitor-applet/flags/pn.svg
+share/link-monitor-applet/flags/pr.svg
+share/link-monitor-applet/flags/pt.svg
+share/link-monitor-applet/flags/pw.svg
+share/link-monitor-applet/flags/py.svg
+share/link-monitor-applet/flags/qa.svg
+share/link-monitor-applet/flags/ro.svg
+share/link-monitor-applet/flags/ru.svg
+share/link-monitor-applet/flags/rw.svg
+share/link-monitor-applet/flags/sa.svg
+share/link-monitor-applet/flags/sb.svg
+share/link-monitor-applet/flags/sc.svg
+share/link-monitor-applet/flags/sd.svg
+share/link-monitor-applet/flags/se.svg
+share/link-monitor-applet/flags/sg.svg
+share/link-monitor-applet/flags/si.svg
+share/link-monitor-applet/flags/sk.svg
+share/link-monitor-applet/flags/sl.svg
+share/link-monitor-applet/flags/sm.svg
+share/link-monitor-applet/flags/sn.svg
+share/link-monitor-applet/flags/so.svg
+share/link-monitor-applet/flags/sr.svg
+share/link-monitor-applet/flags/st.svg
+share/link-monitor-applet/flags/sv.svg
+share/link-monitor-applet/flags/sy.svg
+share/link-monitor-applet/flags/sz.svg
+share/link-monitor-applet/flags/td.svg
+share/link-monitor-applet/flags/tg.svg
+share/link-monitor-applet/flags/th.svg
+share/link-monitor-applet/flags/tj.svg
+share/link-monitor-applet/flags/tk.svg
+share/link-monitor-applet/flags/tm.svg
+share/link-monitor-applet/flags/tn.svg
+share/link-monitor-applet/flags/to.svg
+share/link-monitor-applet/flags/tp.svg
+share/link-monitor-applet/flags/tr.svg
+share/link-monitor-applet/flags/tt.svg
+share/link-monitor-applet/flags/tv.svg
+share/link-monitor-applet/flags/tz.svg
+share/link-monitor-applet/flags/ua.svg
+share/link-monitor-applet/flags/ug.svg
+share/link-monitor-applet/flags/us.svg
+share/link-monitor-applet/flags/uy.svg
+share/link-monitor-applet/flags/uz.svg
+share/link-monitor-applet/flags/va.svg
+share/link-monitor-applet/flags/vc.svg
+share/link-monitor-applet/flags/ve.svg
+share/link-monitor-applet/flags/vn.svg
+share/link-monitor-applet/flags/vu.svg
+share/link-monitor-applet/flags/ws.svg
+share/link-monitor-applet/flags/ye.svg
+share/link-monitor-applet/flags/za.svg
+share/link-monitor-applet/flags/zm.svg
+share/link-monitor-applet/flags/zw.svg
+share/link-monitor-applet/ui/preferences-dialog.glade
+share/omf/link-monitor-applet/link-monitor-applet-C.omf
+share/pixmaps/link-monitor-applet.png
share/locale/fr/LC_MESSAGES/link-monitor-applet.mo
@dirrm share/gnome/help/link-monitor-applet/C/figures
@dirrm share/gnome/help/link-monitor-applet/C
@dirrm share/gnome/help/link-monitor-applet
-@dirrm share/gnome/link-monitor-applet/flags
-@dirrm share/gnome/link-monitor-applet/ui
-@dirrm share/gnome/link-monitor-applet
-@dirrm share/gnome/omf/link-monitor-applet
+@dirrm share/link-monitor-applet/flags
+@dirrm share/link-monitor-applet/ui
+@dirrm share/link-monitor-applet
+@dirrm share/omf/link-monitor-applet
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index a325b1fab695..f5652ecc3053 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linphone
PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:linphone/} \
@@ -39,7 +39,7 @@ MAKE_ENV= SUBDIRS="${SUBDIRS}"
USE_LDCONFIG= yes
CFLAGS+= -DPACKAGE_LOCALE_DIR='\"${PREFIX}/share/locale\"' \
- -DPACKAGE_DATA_DIR='\"${PREFIX}/${DATA_PATH}\"' \
+ -DPACKAGE_DATA_DIR='\"${PREFIX}/share\"' \
-DPACKAGE_SOUND_DIR='\"${DATADIR}/sounds\"' \
-DHAVE_STRUCT_TIMEVAL
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -65,13 +65,11 @@ DESCR= ${PKGDIR}/pkg-descr.gui
PLIST= ${PKGDIR}/pkg-plist.gui
USE_GNOME+= gnomepanel gnomeprefix
MAN1= linphone.1
-DATA_PATH= share/gnome
SUBDIRS= pixmaps gtk
.else
PKGNAMESUFFIX= -base
CONFIGURE_ARGS+= --enable-gtk_ui=no
MAN1= linphonec.1 sipomatic.1
-DATA_PATH= share
SUBDIRS= po gsmlib mediastreamer2 media_api exosip coreapi console
.endif
@@ -91,9 +89,9 @@ post-install:
.if defined(LINPHONE_GUI)
${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
- ${PREFIX}/share/gnome/applications
+ ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/share/linphone_applet.desktop \
- ${PREFIX}/share/gnome/applications
+ ${PREFIX}/share/applications
.else
${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
index a722f7880a5d..6674b192ecdf 100644
--- a/net/linphone-base/pkg-plist.gui
+++ b/net/linphone-base/pkg-plist.gui
@@ -1,18 +1,18 @@
bin/linphone
libdata/bonobo/servers/GNOME_LinphoneApplet.server
libexec/linphone_applet
-share/gnome/applications/linphone.desktop
-share/gnome/applications/linphone_applet.desktop
-share/gnome/gnome-2.0/ui/GNOME_LinphoneApplet.xml
-share/gnome/pixmaps/linphone/linphone.png
-share/gnome/pixmaps/linphone/linphone2.png
-share/gnome/pixmaps/linphone/linphone2.xpm
-share/gnome/pixmaps/linphone/sip-away.png
-share/gnome/pixmaps/linphone/sip-bifm.png
-share/gnome/pixmaps/linphone/sip-busy.png
-share/gnome/pixmaps/linphone/sip-closed.png
-share/gnome/pixmaps/linphone/sip-online.png
-share/gnome/pixmaps/linphone/sip-otl.png
-share/gnome/pixmaps/linphone/sip-otp.png
-share/gnome/pixmaps/linphone/sip-wfa.png
-@dirrm share/gnome/pixmaps/linphone
+share/applications/linphone.desktop
+share/applications/linphone_applet.desktop
+share/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+share/pixmaps/linphone/linphone.png
+share/pixmaps/linphone/linphone2.png
+share/pixmaps/linphone/linphone2.xpm
+share/pixmaps/linphone/sip-away.png
+share/pixmaps/linphone/sip-bifm.png
+share/pixmaps/linphone/sip-busy.png
+share/pixmaps/linphone/sip-closed.png
+share/pixmaps/linphone/sip-online.png
+share/pixmaps/linphone/sip-otl.png
+share/pixmaps/linphone/sip-otp.png
+share/pixmaps/linphone/sip-wfa.png
+@dirrm share/pixmaps/linphone
diff --git a/net/linux-nx-client/Makefile b/net/linux-nx-client/Makefile
index 7436cfdbbef1..93ef70f9817c 100644
--- a/net/linux-nx-client/Makefile
+++ b/net/linux-nx-client/Makefile
@@ -7,7 +7,7 @@
PORTNAME= linux-nx-client
PORTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/Linux/
DISTNAME= nxclient-${PORTVERSION}-17.i386
@@ -48,8 +48,8 @@ do-install:
${MKDIR} ${NXDST}/share/images
${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images
- ${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
- ${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/gnome/pixmaps
+ ${MKDIR} ${LOCALBASE}/share/pixmaps
+ ${INSTALL_DATA} ${NXSRC}/share/icons/*.png ${LOCALBASE}/share/pixmaps
${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \
${LOCALBASE}/share/icons/crystalsvg/32x32
${INSTALL_DATA} ${NXSRC}/share/icons/nx-desktop.png \
diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist
index 879dc6ee920f..4919d2d9ec0c 100644
--- a/net/linux-nx-client/pkg-plist
+++ b/net/linux-nx-client/pkg-plist
@@ -74,12 +74,10 @@ lib/linux-nx-client/share/keys/server.id_dsa.key
@dirrm lib/linux-nx-client/share
@dirrm lib/linux-nx-client
@cwd %%LOCALBASE%%
-share/gnome/pixmaps/nx-desktop.png
-share/gnome/pixmaps/nx.png
-share/gnome/pixmaps/nxclient-admin.png
-share/gnome/pixmaps/nxclient-wizard.png
-@dirrmtry share/gnome/pixmaps
-@dirrmtry share/gnome
+share/pixmaps/nx-desktop.png
+share/pixmaps/nx.png
+share/pixmaps/nxclient-admin.png
+share/pixmaps/nxclient-wizard.png
share/icons/crystalsvg/48x48/nx-desktop.png
share/icons/crystalsvg/32x32/nx.png
share/icons/crystalsvg/32x32/nxclient-admin.png
diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile
index 33b421377631..e56a087b773d 100644
--- a/net/mugshot/Makefile
+++ b/net/mugshot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mugshot
PORTVERSION= 1.1.45
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://download.mugshot.org/client/sources/linux/
diff --git a/net/mugshot/pkg-plist b/net/mugshot/pkg-plist
index 104a70e82151..2d673237d624 100644
--- a/net/mugshot/pkg-plist
+++ b/net/mugshot/pkg-plist
@@ -24,7 +24,7 @@ lib/mugshot/firefox/components/libhippofirefox.so
lib/mugshot/firefox/defaults/preferences/prefs.js
lib/mugshot/firefox/install.rdf
share/applications/mugshot.desktop
-share/autostart/mugshot.desktop
+share/gnome/autostart/mugshot.desktop
@unexec %%PREFIX%%/share/mugshot/firefox-update.sh remove
%%DATADIR%%/firefox-update.sh
%%DATADIR%%/version
@@ -39,24 +39,7 @@ share/icons/hicolor/24x24/apps/mugshot.png
share/icons/hicolor/32x32/apps/mugshot.png
share/icons/hicolor/48x48/apps/mugshot.png
@dirrm %%DATADIR%%
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/24x24/apps
-@dirrm share/icons/hicolor/24x24
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor/128x128/apps
-@dirrm share/icons/hicolor/128x128
-@dirrm share/icons/hicolor
-@dirrm share/icons
-@dirrm share/dbus-1/services
-@dirrm share/dbus-1
-@dirrm share/autostart
-@dirrm share/applications
+@dirrmtry share/applications
@dirrm lib/mugshot/firefox/defaults/preferences
@dirrm lib/mugshot/firefox/defaults
@dirrm lib/mugshot/firefox/components
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 6e527ed6a921..2f18fc1beedb 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/net/netspeed_applet/Makefile,v 1.2 2007/05/19 21:36:17 marcus Exp $
PORTNAME= netspeed_applet
PORTVERSION= 0.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/
diff --git a/net/netspeed_applet/pkg-plist b/net/netspeed_applet/pkg-plist
index 5c47ebd8f824..f4e872288ebb 100644
--- a/net/netspeed_applet/pkg-plist
+++ b/net/netspeed_applet/pkg-plist
@@ -52,15 +52,15 @@ share/gnome/help/netspeed_applet/ru/figures/phone_24.png
share/gnome/help/netspeed_applet/ru/figures/settings.png
share/gnome/help/netspeed_applet/ru/legal.xml
share/gnome/help/netspeed_applet/ru/netspeed_applet.xml
-share/gnome/omf/netspeed_applet/netspeed_applet-C.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-cs.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-de.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-es.omf
-share/gnome/omf/netspeed_applet/netspeed_applet-ru.omf
-share/gnome/pixmaps/netspeed_applet.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-loopback.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-plip.png
-share/gnome/pixmaps/netspeed_applet/gnome-dev-ppp.png
+share/omf/netspeed_applet/netspeed_applet-C.omf
+share/omf/netspeed_applet/netspeed_applet-cs.omf
+share/omf/netspeed_applet/netspeed_applet-de.omf
+share/omf/netspeed_applet/netspeed_applet-es.omf
+share/omf/netspeed_applet/netspeed_applet-ru.omf
+share/pixmaps/netspeed_applet.png
+share/pixmaps/netspeed_applet/gnome-dev-loopback.png
+share/pixmaps/netspeed_applet/gnome-dev-plip.png
+share/pixmaps/netspeed_applet/gnome-dev-ppp.png
share/locale/cs/LC_MESSAGES/netspeed_applet.mo
share/locale/de/LC_MESSAGES/netspeed_applet.mo
share/locale/es/LC_MESSAGES/netspeed_applet.mo
@@ -76,8 +76,8 @@ share/locale/ru/LC_MESSAGES/netspeed_applet.mo
share/locale/sv/LC_MESSAGES/netspeed_applet.mo
share/locale/tr/LC_MESSAGES/netspeed_applet.mo
share/locale/zh_CN/LC_MESSAGES/netspeed_applet.mo
-@dirrm share/gnome/pixmaps/netspeed_applet
-@dirrm share/gnome/omf/netspeed_applet
+@dirrm share/pixmaps/netspeed_applet
+@dirrm share/omf/netspeed_applet
@dirrm share/gnome/help/netspeed_applet/ru/figures
@dirrm share/gnome/help/netspeed_applet/ru
@dirrm share/gnome/help/netspeed_applet/es/figures
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 460027e3fc0a..7ef083f1be5d 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python interface to the Avahi mDNS system
@@ -18,30 +19,16 @@ LIB_DEPENDS= avahi-client.3:${PORTSDIR}/net/avahi
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
-MASTERDIR= ${.CURDIR}/../avahi
+MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-python
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-AVAHI_SLAVE= yes
+AVAHI_SLAVE= python
USE_GNOME= gnomehack gnometarget pygtk2
USE_PYTHON= yes
-CONFIGURE_ARGS= --enable-python \
- --disable-mono \
- --disable-monodoc \
- --disable-gtk \
- --disable-qt3 \
- --disable-qt4 \
- --localstatedir=/var \
- --disable-doxygen-docs \
- --disable-xml-docs \
- --disable-doxygen-dot \
- --localstatedir=/var \
- --with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
- --with-distro=freebsd
-
MAN1= avahi-bookmarks.1 avahi-discover.1
pre-build:
@@ -57,8 +44,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/service-type-database/service-types.db ${DATADIR}
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/avahi
-.for mf in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/man/${mf} ${MAN1PREFIX}/man/man1
-.endfor
.include "${MASTERDIR}/Makefile"
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index ced4ca1a6004..dc582b2aca3f 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/service-discovery-applet/Makefile,v 1.3 2006/10/11 05:53:39 marcus Exp $
+# $MCom: ports/net/service-discovery-applet/Makefile,v 1.5 2007/08/06 16:57:53 mezz Exp $
#
PORTNAME= service-discovery-applet
PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net dns gnome
MASTER_SITES= http://0pointer.de/~sebest/
@@ -36,6 +36,6 @@ post-patch:
post-install:
@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
- ${PREFIX}/share/gnome/service-discovery-applet/icons
+ ${PREFIX}/share/service-discovery-applet/icons
.include <bsd.port.mk>
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index 9f426d622478..ba152e1a99ae 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -10,38 +10,38 @@ lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.py
lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyc
lib/%%PYTHON_VERSION%%/site-packages/sdapplet/pluginutils.pyo
libdata/bonobo/servers/GNOME_ServiceDiscoveryApplet.server
-share/gnome/service-discovery-applet/icons/24x24/_ftp._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_http._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_https._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_rfb._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_sftp-ssh._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/_ssh._tcp.png
-share/gnome/service-discovery-applet/icons/24x24/service-discovery-applet.png
-share/gnome/service-discovery-applet/icons/48x48/_ftp._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_http._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_https._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_rfb._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_sftp-ssh._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/_ssh._tcp.png
-share/gnome/service-discovery-applet/icons/48x48/service-discovery-applet.png
-share/gnome/service-discovery-applet/icons/icon-theme.cache
-share/gnome/service-discovery-applet/interfaces/service-discovery-config.glade
-share/gnome/service-discovery-applet/plugins/ekiga.py
-share/gnome/service-discovery-applet/plugins/gconfterminal.py
-share/gnome/service-discovery-applet/plugins/nautilus.py
-share/gnome/service-discovery-applet/plugins/xvncviewer.py
-share/gnome/service-discovery-applet/tools/exec_wrapper
+share/service-discovery-applet/icons/24x24/_ftp._tcp.png
+share/service-discovery-applet/icons/24x24/_http._tcp.png
+share/service-discovery-applet/icons/24x24/_https._tcp.png
+share/service-discovery-applet/icons/24x24/_rfb._tcp.png
+share/service-discovery-applet/icons/24x24/_sftp-ssh._tcp.png
+share/service-discovery-applet/icons/24x24/_ssh._tcp.png
+share/service-discovery-applet/icons/24x24/service-discovery-applet.png
+share/service-discovery-applet/icons/48x48/_ftp._tcp.png
+share/service-discovery-applet/icons/48x48/_http._tcp.png
+share/service-discovery-applet/icons/48x48/_https._tcp.png
+share/service-discovery-applet/icons/48x48/_rfb._tcp.png
+share/service-discovery-applet/icons/48x48/_sftp-ssh._tcp.png
+share/service-discovery-applet/icons/48x48/_ssh._tcp.png
+share/service-discovery-applet/icons/48x48/service-discovery-applet.png
+share/service-discovery-applet/icons/icon-theme.cache
+share/service-discovery-applet/interfaces/service-discovery-config.glade
+share/service-discovery-applet/plugins/ekiga.py
+share/service-discovery-applet/plugins/gconfterminal.py
+share/service-discovery-applet/plugins/nautilus.py
+share/service-discovery-applet/plugins/xvncviewer.py
+share/service-discovery-applet/tools/exec_wrapper
share/locale/ca/LC_MESSAGES/service-discovery-applet.mo
share/locale/da/LC_MESSAGES/service-discovery-applet.mo
share/locale/de/LC_MESSAGES/service-discovery-applet.mo
share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
-@dirrm share/gnome/service-discovery-applet/tools
-@dirrm share/gnome/service-discovery-applet/plugins
-@dirrm share/gnome/service-discovery-applet/interfaces
-@dirrm share/gnome/service-discovery-applet/icons/48x48
-@dirrm share/gnome/service-discovery-applet/icons/24x24
-@dirrm share/gnome/service-discovery-applet/icons
-@dirrm share/gnome/service-discovery-applet
+@dirrm share/service-discovery-applet/tools
+@dirrm share/service-discovery-applet/plugins
+@dirrm share/service-discovery-applet/interfaces
+@dirrm share/service-discovery-applet/icons/48x48
+@dirrm share/service-discovery-applet/icons/24x24
+@dirrm share/service-discovery-applet/icons
+@dirrm share/service-discovery-applet
@dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
@dirrmtry lib/%%PYTHON_VERSION%%
diff --git a/net/straw/Makefile b/net/straw/Makefile
index eb3a6fcfce6b..8a2f5f03f9fa 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,6 +7,7 @@
PORTNAME= straw
PORTVERSION= 0.27
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -25,10 +26,10 @@ USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras
USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= Straw
-PYDISTUTILS_EGGINFODIR= ${PREFIX}/share/gnome
+PYDISTUTILS_EGGINFODIR= ${PREFIX}/share
PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \
- --install-lib=${PREFIX}/share/gnome \
- --with-desktop-file-dir=share/gnome/applications
+ --install-lib=${PREFIX}/share \
+ --with-desktop-file-dir=share/applications
GCONF_SCHEMAS= straw.schemas
diff --git a/net/straw/files/patch-constants.py.in b/net/straw/files/patch-constants.py.in
deleted file mode 100644
index a0b097fa5403..000000000000
--- a/net/straw/files/patch-constants.py.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- constants.py.in Sat Feb 4 14:24:37 2006
-+++ constants.py.in Wed Jan 3 23:42:34 2007
-@@ -11,7 +11,7 @@
- STRAW_REF_URL = "%sstraw-ref.html" % STRAW_URL
- libdir = os.path.normpath('$libdir')
- localedir = os.path.normpath(os.path.join('$datadir','locale'))
--datadir = os.path.normpath(os.path.join('$datadir','straw'))
-+datadir = os.path.normpath(os.path.join('$datadir','gnome','straw'))
-
- # if STRAW_IN_SOURCE_DIR, this will be the glade/ and images/ in source
- # which is different from datadir (data/), whereas on default installations,
diff --git a/net/straw/files/patch-setup.py b/net/straw/files/patch-setup.py
index 0e4ca8d55714..a024cf1f0576 100644
--- a/net/straw/files/patch-setup.py
+++ b/net/straw/files/patch-setup.py
@@ -1,14 +1,5 @@
--- setup.py Sat Feb 18 16:22:43 2006
+++ setup.py Wed Jan 3 23:38:53 2007
-@@ -127,7 +127,7 @@
- ]
- files = [
- ('share/pixmaps', ['images/straw.png']),
-- ('share/straw', images + misc)]
-+ ('share/gnome/straw', images + misc)]
- return files
-
- # Let distutils do the work
@@ -146,7 +146,7 @@
pot_file = 'po/straw.pot',
translations = translations(),
diff --git a/net/straw/files/patch-src::straw b/net/straw/files/patch-src::straw
index cb965b2ce848..ec142ac7ee74 100644
--- a/net/straw/files/patch-src::straw
+++ b/net/straw/files/patch-src::straw
@@ -1,14 +1,5 @@
--- src/straw Sat Oct 21 07:53:23 2006
+++ src/straw Sun May 20 09:49:06 2007
-@@ -49,7 +49,7 @@
- if not sdir:
- h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
- if t == 'bin':
-- libdir = os.path.join(h, 'lib')
-+ libdir = os.path.join(h, 'share', 'gnome')
- fp = os.path.join(libdir, 'straw')
- if os.path.isdir(fp):
- sdir = fp
@@ -102,7 +102,7 @@
if ENV_IN_SOURCE:
from lib import Application, Config
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 453d699a646e..4f0bdbb280e6 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -1,143 +1,143 @@
bin/straw
-share/gnome/applications/straw.desktop
-share/gnome/straw/Application.py
-share/gnome/straw/Application.pyc
-share/gnome/straw/Application.pyo
-share/gnome/straw/CategorySelector.py
-share/gnome/straw/CategorySelector.pyc
-share/gnome/straw/CategorySelector.pyo
-share/gnome/straw/Config.py
-share/gnome/straw/Config.pyc
-share/gnome/straw/Config.pyo
-share/gnome/straw/Event.py
-share/gnome/straw/Event.pyc
-share/gnome/straw/Event.pyo
-share/gnome/straw/Feed.py
-share/gnome/straw/Feed.pyc
-share/gnome/straw/Feed.pyo
-share/gnome/straw/FeedCategoryList.py
-share/gnome/straw/FeedCategoryList.pyc
-share/gnome/straw/FeedCategoryList.pyo
-share/gnome/straw/FeedDataRouter.py
-share/gnome/straw/FeedDataRouter.pyc
-share/gnome/straw/FeedDataRouter.pyo
-share/gnome/straw/FeedItems.py
-share/gnome/straw/FeedItems.pyc
-share/gnome/straw/FeedItems.pyo
-share/gnome/straw/FeedList.py
-share/gnome/straw/FeedList.pyc
-share/gnome/straw/FeedList.pyo
-share/gnome/straw/FeedListView.py
-share/gnome/straw/FeedListView.pyc
-share/gnome/straw/FeedListView.pyo
-share/gnome/straw/FeedPropertiesDialog.py
-share/gnome/straw/FeedPropertiesDialog.pyc
-share/gnome/straw/FeedPropertiesDialog.pyo
-share/gnome/straw/Find.py
-share/gnome/straw/Find.pyc
-share/gnome/straw/Find.pyo
-share/gnome/straw/ImageCache.py
-share/gnome/straw/ImageCache.pyc
-share/gnome/straw/ImageCache.pyo
-share/gnome/straw/ItemList.py
-share/gnome/straw/ItemList.pyc
-share/gnome/straw/ItemList.pyo
-share/gnome/straw/ItemStore.py
-share/gnome/straw/ItemStore.pyc
-share/gnome/straw/ItemStore.pyo
-share/gnome/straw/ItemView.py
-share/gnome/straw/ItemView.pyc
-share/gnome/straw/ItemView.pyo
-share/gnome/straw/LookupManager.py
-share/gnome/straw/LookupManager.pyc
-share/gnome/straw/LookupManager.pyo
-share/gnome/straw/MVP.py
-share/gnome/straw/MVP.pyc
-share/gnome/straw/MVP.pyo
-share/gnome/straw/MainloopManager.py
-share/gnome/straw/MainloopManager.pyc
-share/gnome/straw/MainloopManager.pyo
-share/gnome/straw/MessageManager.py
-share/gnome/straw/MessageManager.pyc
-share/gnome/straw/MessageManager.pyo
-share/gnome/straw/NetworkConstants.py
-share/gnome/straw/NetworkConstants.pyc
-share/gnome/straw/NetworkConstants.pyo
-share/gnome/straw/OPML.py
-share/gnome/straw/OPML.pyc
-share/gnome/straw/OPML.pyo
-share/gnome/straw/OPMLExport.py
-share/gnome/straw/OPMLExport.pyc
-share/gnome/straw/OPMLExport.pyo
-share/gnome/straw/OPMLImport.py
-share/gnome/straw/OPMLImport.pyc
-share/gnome/straw/OPMLImport.pyo
-share/gnome/straw/OfflineToggle.py
-share/gnome/straw/OfflineToggle.pyc
-share/gnome/straw/OfflineToggle.pyo
-share/gnome/straw/ParsedSummary.py
-share/gnome/straw/ParsedSummary.pyc
-share/gnome/straw/ParsedSummary.pyo
-share/gnome/straw/PollManager.py
-share/gnome/straw/PollManager.pyc
-share/gnome/straw/PollManager.pyo
-share/gnome/straw/PreferencesDialog.py
-share/gnome/straw/PreferencesDialog.pyc
-share/gnome/straw/PreferencesDialog.pyo
-share/gnome/straw/QueueDict.py
-share/gnome/straw/QueueDict.pyc
-share/gnome/straw/QueueDict.pyo
-share/gnome/straw/SummaryItem.py
-share/gnome/straw/SummaryItem.pyc
-share/gnome/straw/SummaryItem.pyo
-share/gnome/straw/SummaryParser.py
-share/gnome/straw/SummaryParser.pyc
-share/gnome/straw/SummaryParser.pyo
-share/gnome/straw/Tray.py
-share/gnome/straw/Tray.pyc
-share/gnome/straw/Tray.pyo
-share/gnome/straw/URLFetch.py
-share/gnome/straw/URLFetch.pyc
-share/gnome/straw/URLFetch.pyo
-share/gnome/straw/ValueMonitor.py
-share/gnome/straw/ValueMonitor.pyc
-share/gnome/straw/ValueMonitor.pyo
-share/gnome/straw/__init__.py
-share/gnome/straw/__init__.pyc
-share/gnome/straw/__init__.pyo
-share/gnome/straw/constants.py
-share/gnome/straw/constants.pyc
-share/gnome/straw/constants.pyo
-share/gnome/straw/default_subscriptions.opml
-share/gnome/straw/dialogs.py
-share/gnome/straw/dialogs.pyc
-share/gnome/straw/dialogs.pyo
-share/gnome/straw/error.py
-share/gnome/straw/error.pyc
-share/gnome/straw/error.pyo
-share/gnome/straw/feedfinder.py
-share/gnome/straw/feedfinder.pyc
-share/gnome/straw/feedfinder.pyo
-share/gnome/straw/feedparser.py
-share/gnome/straw/feedparser.pyc
-share/gnome/straw/feedparser.pyo
-share/gnome/straw/httplib_async.py
-share/gnome/straw/httplib_async.pyc
-share/gnome/straw/httplib_async.pyo
-share/gnome/straw/image-broken.png
-share/gnome/straw/image-waiting.png
-share/gnome/straw/straw.css
-share/gnome/straw/straw.glade
-share/gnome/straw/straw.png
-share/gnome/straw/strawdbus.py
-share/gnome/straw/strawdbus.pyc
-share/gnome/straw/strawdbus.pyo
-share/gnome/straw/subscribe.py
-share/gnome/straw/subscribe.pyc
-share/gnome/straw/subscribe.pyo
-share/gnome/straw/utils.py
-share/gnome/straw/utils.pyc
-share/gnome/straw/utils.pyo
+share/applications/straw.desktop
+share/straw/Application.py
+share/straw/Application.pyc
+share/straw/Application.pyo
+share/straw/CategorySelector.py
+share/straw/CategorySelector.pyc
+share/straw/CategorySelector.pyo
+share/straw/Config.py
+share/straw/Config.pyc
+share/straw/Config.pyo
+share/straw/Event.py
+share/straw/Event.pyc
+share/straw/Event.pyo
+share/straw/Feed.py
+share/straw/Feed.pyc
+share/straw/Feed.pyo
+share/straw/FeedCategoryList.py
+share/straw/FeedCategoryList.pyc
+share/straw/FeedCategoryList.pyo
+share/straw/FeedDataRouter.py
+share/straw/FeedDataRouter.pyc
+share/straw/FeedDataRouter.pyo
+share/straw/FeedItems.py
+share/straw/FeedItems.pyc
+share/straw/FeedItems.pyo
+share/straw/FeedList.py
+share/straw/FeedList.pyc
+share/straw/FeedList.pyo
+share/straw/FeedListView.py
+share/straw/FeedListView.pyc
+share/straw/FeedListView.pyo
+share/straw/FeedPropertiesDialog.py
+share/straw/FeedPropertiesDialog.pyc
+share/straw/FeedPropertiesDialog.pyo
+share/straw/Find.py
+share/straw/Find.pyc
+share/straw/Find.pyo
+share/straw/ImageCache.py
+share/straw/ImageCache.pyc
+share/straw/ImageCache.pyo
+share/straw/ItemList.py
+share/straw/ItemList.pyc
+share/straw/ItemList.pyo
+share/straw/ItemStore.py
+share/straw/ItemStore.pyc
+share/straw/ItemStore.pyo
+share/straw/ItemView.py
+share/straw/ItemView.pyc
+share/straw/ItemView.pyo
+share/straw/LookupManager.py
+share/straw/LookupManager.pyc
+share/straw/LookupManager.pyo
+share/straw/MVP.py
+share/straw/MVP.pyc
+share/straw/MVP.pyo
+share/straw/MainloopManager.py
+share/straw/MainloopManager.pyc
+share/straw/MainloopManager.pyo
+share/straw/MessageManager.py
+share/straw/MessageManager.pyc
+share/straw/MessageManager.pyo
+share/straw/NetworkConstants.py
+share/straw/NetworkConstants.pyc
+share/straw/NetworkConstants.pyo
+share/straw/OPML.py
+share/straw/OPML.pyc
+share/straw/OPML.pyo
+share/straw/OPMLExport.py
+share/straw/OPMLExport.pyc
+share/straw/OPMLExport.pyo
+share/straw/OPMLImport.py
+share/straw/OPMLImport.pyc
+share/straw/OPMLImport.pyo
+share/straw/OfflineToggle.py
+share/straw/OfflineToggle.pyc
+share/straw/OfflineToggle.pyo
+share/straw/ParsedSummary.py
+share/straw/ParsedSummary.pyc
+share/straw/ParsedSummary.pyo
+share/straw/PollManager.py
+share/straw/PollManager.pyc
+share/straw/PollManager.pyo
+share/straw/PreferencesDialog.py
+share/straw/PreferencesDialog.pyc
+share/straw/PreferencesDialog.pyo
+share/straw/QueueDict.py
+share/straw/QueueDict.pyc
+share/straw/QueueDict.pyo
+share/straw/SummaryItem.py
+share/straw/SummaryItem.pyc
+share/straw/SummaryItem.pyo
+share/straw/SummaryParser.py
+share/straw/SummaryParser.pyc
+share/straw/SummaryParser.pyo
+share/straw/Tray.py
+share/straw/Tray.pyc
+share/straw/Tray.pyo
+share/straw/URLFetch.py
+share/straw/URLFetch.pyc
+share/straw/URLFetch.pyo
+share/straw/ValueMonitor.py
+share/straw/ValueMonitor.pyc
+share/straw/ValueMonitor.pyo
+share/straw/__init__.py
+share/straw/__init__.pyc
+share/straw/__init__.pyo
+share/straw/constants.py
+share/straw/constants.pyc
+share/straw/constants.pyo
+share/straw/default_subscriptions.opml
+share/straw/dialogs.py
+share/straw/dialogs.pyc
+share/straw/dialogs.pyo
+share/straw/error.py
+share/straw/error.pyc
+share/straw/error.pyo
+share/straw/feedfinder.py
+share/straw/feedfinder.pyc
+share/straw/feedfinder.pyo
+share/straw/feedparser.py
+share/straw/feedparser.pyc
+share/straw/feedparser.pyo
+share/straw/httplib_async.py
+share/straw/httplib_async.pyc
+share/straw/httplib_async.pyo
+share/straw/image-broken.png
+share/straw/image-waiting.png
+share/straw/straw.css
+share/straw/straw.glade
+share/straw/straw.png
+share/straw/strawdbus.py
+share/straw/strawdbus.pyc
+share/straw/strawdbus.pyo
+share/straw/subscribe.py
+share/straw/subscribe.pyc
+share/straw/subscribe.pyo
+share/straw/utils.py
+share/straw/utils.pyc
+share/straw/utils.pyo
share/locale/ar/LC_MESSAGES/straw.mo
share/locale/bg/LC_MESSAGES/straw.mo
share/locale/cs/LC_MESSAGES/straw.mo
@@ -167,4 +167,5 @@ share/locale/uk/LC_MESSAGES/straw.mo
share/locale/vi/LC_MESSAGES/straw.mo
share/locale/zh_CN/LC_MESSAGES/straw.mo
share/pixmaps/straw.png
-@dirrm share/gnome/straw
+@dirrm share/straw
+@dirrmtry share/applications
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index f84cf4c081a9..efb11d77288a 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tsclient
PORTVERSION= 0.148
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= http://www.gnomepro.com/tsclient/
@@ -44,7 +44,7 @@ post-patch:
${WRKSRC}/configure
post-install:
- @${LN} -sf ${PREFIX}/share/gnome/pixmaps/tsclient/tsclient.png \
- ${PREFIX}/share/gnome/pixmaps/tsclient.png
+ @${LN} -sf ${PREFIX}/share/pixmaps/tsclient/tsclient.png \
+ ${PREFIX}/share/pixmaps/tsclient.png
.include <bsd.port.mk>
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index b1591f5aabb6..c4903907074f 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -1,29 +1,29 @@
bin/tsclient
-share/gnome/application-registry/tsclient.applications
-share/gnome/applications/tsclient.desktop
-share/gnome/mime-info/tsclient.keys
-share/gnome/mime-info/tsclient.mime
-share/gnome/pixmaps/tsclient.png
-share/gnome/pixmaps/tsclient/banner-ar.png
-share/gnome/pixmaps/tsclient/banner-en.png
-share/gnome/pixmaps/tsclient/banner-es.png
-share/gnome/pixmaps/tsclient/banner-hu.png
-share/gnome/pixmaps/tsclient/banner-ja.png
-share/gnome/pixmaps/tsclient/banner-ms.png
-share/gnome/pixmaps/tsclient/banner-nl.png
-share/gnome/pixmaps/tsclient/banner-pa.png
-share/gnome/pixmaps/tsclient/banner-ru.png
-share/gnome/pixmaps/tsclient/banner-sv.png
-share/gnome/pixmaps/tsclient/banner-zh-cn.png
-share/gnome/pixmaps/tsclient/banner-zh-tw.png
-share/gnome/pixmaps/tsclient/colors.png
-share/gnome/pixmaps/tsclient/computer.png
-share/gnome/pixmaps/tsclient/keyboard.png
-share/gnome/pixmaps/tsclient/perform.png
-share/gnome/pixmaps/tsclient/program.png
-share/gnome/pixmaps/tsclient/size.png
-share/gnome/pixmaps/tsclient/sound.png
-share/gnome/pixmaps/tsclient/tsclient.png
+share/application-registry/tsclient.applications
+share/applications/tsclient.desktop
+share/mime-info/tsclient.keys
+share/mime-info/tsclient.mime
+share/pixmaps/tsclient.png
+share/pixmaps/tsclient/banner-ar.png
+share/pixmaps/tsclient/banner-en.png
+share/pixmaps/tsclient/banner-es.png
+share/pixmaps/tsclient/banner-hu.png
+share/pixmaps/tsclient/banner-ja.png
+share/pixmaps/tsclient/banner-ms.png
+share/pixmaps/tsclient/banner-nl.png
+share/pixmaps/tsclient/banner-pa.png
+share/pixmaps/tsclient/banner-ru.png
+share/pixmaps/tsclient/banner-sv.png
+share/pixmaps/tsclient/banner-zh-cn.png
+share/pixmaps/tsclient/banner-zh-tw.png
+share/pixmaps/tsclient/colors.png
+share/pixmaps/tsclient/computer.png
+share/pixmaps/tsclient/keyboard.png
+share/pixmaps/tsclient/perform.png
+share/pixmaps/tsclient/program.png
+share/pixmaps/tsclient/size.png
+share/pixmaps/tsclient/sound.png
+share/pixmaps/tsclient/tsclient.png
share/locale/ar/LC_MESSAGES/tsclient.mo
share/locale/ca/LC_MESSAGES/tsclient.mo
share/locale/cs/LC_MESSAGES/tsclient.mo
@@ -62,4 +62,5 @@ share/locale/zh_TW/LC_MESSAGES/tsclient.mo
@dirrmtry share/locale/se
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrm share/gnome/pixmaps/tsclient
+@dirrm share/pixmaps/tsclient
+@dirrmtry share/applications
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 12e0f5cc2f99..1ca45177c993 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.37 2007/03/12 13:41:32 ahze Exp $
+# $MCom: ports/net/vino/Makefile,v 1.48 2007/10/15 17:13:51 mezz Exp $
#
PORTNAME= vino
-PORTVERSION= 2.18.1
-PORTREVISION= 2
+PORTVERSION= 2.20.1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,9 +26,16 @@ GNOME_DESKTOP_VERSION=2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --enable-session-support
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= vino-server.schemas
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-libnotify=yes
+.else
+CONFIGURE_ARGS+=--enable-libnotify=no
+.endif
+
.include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 3e47221e2b1e..eb4977814af6 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.18.1.tar.bz2) = caf0025b1ed95f03e29f9b40ae48b75b
-SHA256 (vino-2.18.1.tar.bz2) = ce50a7c8c8209aecf81912f9eb784c9a5a8748f89abf49ac613c907e6ecc12f4
-SIZE (vino-2.18.1.tar.bz2) = 635144
+MD5 (vino-2.20.1.tar.bz2) = c45379bd177e0bc9a937a3388fc81650
+SHA256 (vino-2.20.1.tar.bz2) = 372ec01ebf8bffdd4b2f318eae7a49873a79634bb715e6355de19809c9fa1221
+SIZE (vino-2.20.1.tar.bz2) = 625243
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 16bb51793ffb..067a1a1cc76b 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -2,9 +2,7 @@ bin/vino-preferences
bin/vino-session
libdata/bonobo/servers/GNOME_RemoteDesktop.server
libexec/vino-server
-share/gnome/applications/vino-preferences.desktop
-share/gnome/vino/vino-preferences.glade
-share/gnome/vino/vino-prompt.glade
+share/applications/vino-preferences.desktop
share/icons/hicolor/48x48/apps/gnome-remote-desktop.png
share/locale/ar/LC_MESSAGES/vino.mo
share/locale/az/LC_MESSAGES/vino.mo
@@ -48,6 +46,7 @@ share/locale/nb/LC_MESSAGES/vino.mo
share/locale/ne/LC_MESSAGES/vino.mo
share/locale/nl/LC_MESSAGES/vino.mo
share/locale/nn/LC_MESSAGES/vino.mo
+share/locale/oc/LC_MESSAGES/vino.mo
share/locale/or/LC_MESSAGES/vino.mo
share/locale/pa/LC_MESSAGES/vino.mo
share/locale/pl/LC_MESSAGES/vino.mo
@@ -56,6 +55,7 @@ share/locale/pt_BR/LC_MESSAGES/vino.mo
share/locale/ro/LC_MESSAGES/vino.mo
share/locale/ru/LC_MESSAGES/vino.mo
share/locale/rw/LC_MESSAGES/vino.mo
+share/locale/si/LC_MESSAGES/vino.mo
share/locale/sk/LC_MESSAGES/vino.mo
share/locale/sl/LC_MESSAGES/vino.mo
share/locale/sq/LC_MESSAGES/vino.mo
@@ -73,18 +73,25 @@ share/locale/xh/LC_MESSAGES/vino.mo
share/locale/zh_CN/LC_MESSAGES/vino.mo
share/locale/zh_HK/LC_MESSAGES/vino.mo
share/locale/zh_TW/LC_MESSAGES/vino.mo
-@dirrm share/gnome/vino
+%%DATADIR%%/vino-preferences.glade
+%%DATADIR%%/vino-prompt.glade
+@dirrm %%DATADIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications