summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2012-09-02 07:02:13 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2012-09-02 07:02:13 +0800
commita9b346a7e03e2403576d122a934a2c4aef545838 (patch)
treed0131fffa0ab197df4d480930568a3c403117642 /net
parent044a08d239fc66906b2c14a4e2decdc3e1e065b9 (diff)
downloadmarcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar.gz
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar.bz2
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar.lz
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar.xz
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.tar.zst
marcuscom-ports-a9b346a7e03e2403576d122a934a2c4aef545838.zip
Sync w/ FreeBSD ports. x11 and x11-* left to go.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17058 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net')
-rw-r--r--net/avahi-app/Makefile8
-rw-r--r--net/ekiga/Makefile2
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/gtk-vnc/files/patch-src_gvnc.c11
-rw-r--r--net/libgweather/Makefile4
-rw-r--r--net/libproxy/files/patch-libproxy_url.cpp10
-rw-r--r--net/libproxy/files/patch-utils-CMakeLists.txt8
-rw-r--r--net/vinagre/Makefile4
-rw-r--r--net/vino/Makefile4
11 files changed, 44 insertions, 15 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 29ad92db1..e8c520242 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/avahi-app/Makefile,v 1.23 2012/07/09 18:22:18 kwm Exp $
+# $MCom: ports/net/avahi-app/Makefile,v 1.24 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= avahi
@@ -26,6 +26,9 @@ LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
gdbm.4:${PORTSDIR}/databases/gdbm
RUN_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+USERS?= ${PORTNAME}
+GROUPS?= ${USERS}
+
USE_GNOME?= gnomehack ltverhack glib20 intltool
USE_GETTEXT= yes
USE_GNOME_SUBR= yes
@@ -174,8 +177,5 @@ avahi-post-install:
${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
${LOCALBASE}/share/dbus-1/system-services
.endif
-.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
.endif # avahi-header
.include <bsd.port.post.mk>
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 6690c3899..c452f9d98 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.11
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index b4ba8d382..7b201f523 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -18,7 +18,7 @@ COMMENT= VoIP and video conferencing application
LIB_DEPENDS= sigc-2:${PORTSDIR}/devel/libsigc++20 \
opal-3.6.[6-9]:${PORTSDIR}/net/opal3
BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool \
- ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/bin/scrollkeeper-config:${PORTSDIR}/textproc/rarian
CONFLICTS= ekiga-2.*
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 41b994181..bcde84c43 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.60 2011/05/01 23:42:25 mezz Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.61 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= gnome-nettool
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 4afc463df..5dcf97735 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-vnc
PORTVERSION= 0.3.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gtk-vnc/files/patch-src_gvnc.c b/net/gtk-vnc/files/patch-src_gvnc.c
new file mode 100644
index 000000000..dcf479f23
--- /dev/null
+++ b/net/gtk-vnc/files/patch-src_gvnc.c
@@ -0,0 +1,11 @@
+--- src/gvnc.c.orig 2012-03-17 12:30:12.000000000 -0500
++++ src/gvnc.c 2012-03-17 12:31:37.000000000 -0500
+@@ -3543,7 +3543,7 @@
+ gvnc->minor = 8;
+ }
+
+- snprintf(version, 12, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
++ snprintf(version, 13, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
+ gvnc_write(gvnc, version, 12);
+ gvnc_flush(gvnc);
+ GVNC_DEBUG("Using version: %d.%d", gvnc->major, gvnc->minor);
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index f312c5c54..231917a26 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/libgweather/Makefile,v 1.45 2011/04/30 20:43:23 mezz Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.46 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= libgweather
PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libproxy/files/patch-libproxy_url.cpp b/net/libproxy/files/patch-libproxy_url.cpp
new file mode 100644
index 000000000..b185b2bd5
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_url.cpp
@@ -0,0 +1,10 @@
+--- libproxy/url.cpp~
++++ libproxy/url.cpp
+@@ -27,6 +27,7 @@
+ #define close _close
+ #endif
+ #include <fcntl.h> // For ::open()
++#include <unistd.h> // For close()
+ #include <cstring> // For memcpy()
+ #include <sstream> // For int/string conversion (using stringstream)
+ #include <cstdio> // For sscanf()
diff --git a/net/libproxy/files/patch-utils-CMakeLists.txt b/net/libproxy/files/patch-utils-CMakeLists.txt
new file mode 100644
index 000000000..014f04d42
--- /dev/null
+++ b/net/libproxy/files/patch-utils-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- utils/CMakeLists.txt~
++++ utils/CMakeLists.txt
+@@ -3,4 +3,5 @@ link_directories(${LIBPROXY_LIBRARY_DIRS
+
+ add_executable(proxy proxy.c)
+ target_link_libraries(proxy libproxy)
++set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
+ install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) \ No newline at end of file
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 1921e36ea..5eea9890b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/vinagre/Makefile,v 1.46 2011/09/17 16:26:44 kwm Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.47 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= vinagre
PORTVERSION= 2.30.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 850065024..a5879d43f 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,12 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.87 2011/06/06 17:54:24 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.88 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= vino
PORTVERSION= 2.32.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2