diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-01-18 01:07:04 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-01-18 01:07:04 +0800 |
commit | eaa089fa962608413b08058ad3735bcd3407a6c9 (patch) | |
tree | dd7a454218650c22f871c192dbed9eeddf468f79 | |
parent | 32f2a170e7bc2f9d7f1bb3e64bc5563eff748244 (diff) | |
download | marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar.gz marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar.bz2 marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar.lz marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar.xz marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.tar.zst marcuscom-ports-eaa089fa962608413b08058ad3735bcd3407a6c9.zip |
Update gtk-vnc to gtk3 based. Update vinagre dependacy.
The virt-manager/virt-viewer ports have devel versions that using the gtk3
backed version of gtk-vnc so no need to keep the gtk2 version around.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18977 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | net/gtk-vnc/Makefile | 8 | ||||
-rw-r--r-- | net/gtk-vnc/pkg-plist | 31 | ||||
-rw-r--r-- | net/gtk-vnc3/Makefile | 33 | ||||
-rw-r--r-- | net/gtk-vnc3/distinfo | 2 | ||||
-rw-r--r-- | net/gtk-vnc3/files/patch-src_continuation.h | 10 | ||||
-rw-r--r-- | net/gtk-vnc3/files/patch-src_coroutine_ucontext.c | 11 | ||||
-rw-r--r-- | net/gtk-vnc3/pkg-descr | 10 | ||||
-rw-r--r-- | net/gtk-vnc3/pkg-plist | 62 | ||||
-rw-r--r-- | net/vinagre/Makefile | 2 |
9 files changed, 22 insertions, 147 deletions
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index a89f26a21..918dbe557 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -3,12 +3,14 @@ PORTNAME= gtk-vnc PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ +BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 @@ -17,15 +19,15 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LIB USE_XZ= yes -USE_GNOME= gtk20 introspection:build +USE_GNOME= gnomehier gtk30 introspection:build USES= gettext gmake pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-gtk=2.0 --enable-introspection \ +CONFIGURE_ARGS= --with-gtk=3.0 --enable-introspection \ --disable-plugin --without-python -MAKE_JOBS_UNSAFE=yes +MAKE_JOBS_UNSAFE= yes post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.0 diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist index 371858669..15e8565bd 100644 --- a/net/gtk-vnc/pkg-plist +++ b/net/gtk-vnc/pkg-plist @@ -1,9 +1,9 @@ bin/gvnccapture -include/gtk-vnc-1.0/gtk-vnc.h -include/gtk-vnc-1.0/vncdisplay.h -include/gtk-vnc-1.0/vncdisplayenums.h -include/gtk-vnc-1.0/vncgrabsequence.h -include/gtk-vnc-1.0/vncimageframebuffer.h +include/gtk-vnc-2.0/gtk-vnc.h +include/gtk-vnc-2.0/vncdisplay.h +include/gtk-vnc-2.0/vncdisplayenums.h +include/gtk-vnc-2.0/vncgrabsequence.h +include/gtk-vnc-2.0/vncimageframebuffer.h include/gvnc-1.0/gvnc.h include/gvnc-1.0/vncbaseframebuffer.h include/gvnc-1.0/vnccolormap.h @@ -14,18 +14,18 @@ include/gvnc-1.0/vncframebuffer.h include/gvnc-1.0/vncpixelformat.h include/gvnc-1.0/vncutil.h lib/girepository-1.0/GVnc-1.0.typelib -lib/girepository-1.0/GtkVnc-1.0.typelib -lib/libgtk-vnc-1.0.la -lib/libgtk-vnc-1.0.so -lib/libgtk-vnc-1.0.so.0 +lib/girepository-1.0/GtkVnc-2.0.typelib +lib/libgtk-vnc-2.0.la +lib/libgtk-vnc-2.0.so +lib/libgtk-vnc-2.0.so.0 lib/libgvnc-1.0.la lib/libgvnc-1.0.so lib/libgvnc-1.0.so.0 -libdata/pkgconfig/gtk-vnc-1.0.pc +libdata/pkgconfig/gtk-vnc-2.0.pc libdata/pkgconfig/gvnc-1.0.pc man/man1/gvnccapture.1.gz share/gir-1.0/GVnc-1.0.gir -share/gir-1.0/GtkVnc-1.0.gir +share/gir-1.0/GtkVnc-2.0.gir share/locale/ca/LC_MESSAGES/gtk-vnc.mo share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo share/locale/cs/LC_MESSAGES/gtk-vnc.mo @@ -58,11 +58,12 @@ share/locale/tr/LC_MESSAGES/gtk-vnc.mo share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK +share/vala/vapi/gtk-vnc-2.0.deps +share/vala/vapi/gtk-vnc-2.0.vapi +share/vala/vapi/gvnc-1.0.vapi +@dirrm include/gtk-vnc-2.0 +@dirrm include/gvnc-1.0 @dirrmtry share/locale/nds/LC_MESSAGES @dirrmtry share/locale/nds @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia -@dirrm include/gtk-vnc-1.0 -@dirrm include/gvnc-1.0 diff --git a/net/gtk-vnc3/Makefile b/net/gtk-vnc3/Makefile deleted file mode 100644 index 32324a1dd..000000000 --- a/net/gtk-vnc3/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= gtk-vnc -PORTVERSION= 0.4.4 -PORTREVISION= 1 -CATEGORIES= net gnome -MASTER_SITES= GNOME -PKGNAMESUFFIX= 3 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= VNC viewer widget for GTK+ - -LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 - -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING.LIB - -CONFLICTS= gtk-vnc-0.3.[0-9]* - -USE_XZ= yes -USE_GNOME= gtk30 -USES= gettext gmake pathfix pkgconfig -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-gtk=3.0 --disable-introspection \ - --disable-plugin --without-python - -.include <bsd.port.mk> diff --git a/net/gtk-vnc3/distinfo b/net/gtk-vnc3/distinfo deleted file mode 100644 index 764f4cc43..000000000 --- a/net/gtk-vnc3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gtk-vnc-0.4.4.tar.xz) = c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7 -SIZE (gtk-vnc-0.4.4.tar.xz) = 377304 diff --git a/net/gtk-vnc3/files/patch-src_continuation.h b/net/gtk-vnc3/files/patch-src_continuation.h deleted file mode 100644 index 6b4878259..000000000 --- a/net/gtk-vnc3/files/patch-src_continuation.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/continuation.h.orig 2011-02-18 16:29:10.000000000 +0000 -+++ src/continuation.h 2011-02-20 17:50:37.000000000 +0000 -@@ -21,6 +21,7 @@ - #ifndef _CONTINUATION_H_ - #define _CONTINUATION_H_ - -+#include <sys/types.h> - #include <ucontext.h> - - struct continuation diff --git a/net/gtk-vnc3/files/patch-src_coroutine_ucontext.c b/net/gtk-vnc3/files/patch-src_coroutine_ucontext.c deleted file mode 100644 index e50fb8576..000000000 --- a/net/gtk-vnc3/files/patch-src_coroutine_ucontext.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/coroutine_ucontext.c.orig 2011-02-18 16:29:10.000000000 +0000 -+++ src/coroutine_ucontext.c 2011-02-20 17:51:14.000000000 +0000 -@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co) - co->cc.stack_size = co->stack_size; - co->cc.stack = mmap(0, co->stack_size, - PROT_READ | PROT_WRITE, -- MAP_PRIVATE | MAP_ANONYMOUS, -+ MAP_PRIVATE | MAP_ANON, - -1, 0); - if (co->cc.stack == MAP_FAILED) - return -1; diff --git a/net/gtk-vnc3/pkg-descr b/net/gtk-vnc3/pkg-descr deleted file mode 100644 index 08b3cf791..000000000 --- a/net/gtk-vnc3/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -GTK-VNC is a VNC viewer widget for GTK+. It is built using coroutines, -allowing it to be completely asynchronous while remaining single threaded. -It supports RFB protocols 3.3 through 3.8 and the VeNCrypt authentication -extension providing SSL/TLS encryption with x509 certificate authentication. -The core library is written in C and a binding for Python using PyGTK is -available. The networking layer supports connections over both IPv4 and IPv6. -Example code illustrates how to build a vncviewer replacement using either C -or Python. - -WWW: http://live.gnome.org/gtk-vnc diff --git a/net/gtk-vnc3/pkg-plist b/net/gtk-vnc3/pkg-plist deleted file mode 100644 index 5345278dd..000000000 --- a/net/gtk-vnc3/pkg-plist +++ /dev/null @@ -1,62 +0,0 @@ -bin/gvnccapture -include/gtk-vnc-2.0/gtk-vnc.h -include/gtk-vnc-2.0/vncdisplay.h -include/gtk-vnc-2.0/vncdisplayenums.h -include/gtk-vnc-2.0/vncgrabsequence.h -include/gtk-vnc-2.0/vncimageframebuffer.h -include/gvnc-1.0/gvnc.h -include/gvnc-1.0/vncbaseframebuffer.h -include/gvnc-1.0/vnccolormap.h -include/gvnc-1.0/vncconnection.h -include/gvnc-1.0/vncconnectionenums.h -include/gvnc-1.0/vnccursor.h -include/gvnc-1.0/vncframebuffer.h -include/gvnc-1.0/vncpixelformat.h -include/gvnc-1.0/vncutil.h -lib/libgtk-vnc-2.0.la -lib/libgtk-vnc-2.0.so -lib/libgtk-vnc-2.0.so.0 -lib/libgvnc-1.0.la -lib/libgvnc-1.0.so -lib/libgvnc-1.0.so.0 -libdata/pkgconfig/gtk-vnc-2.0.pc -libdata/pkgconfig/gvnc-1.0.pc -man/man1/gvnccapture.1.gz -share/locale/ca/LC_MESSAGES/gtk-vnc.mo -share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo -share/locale/cs/LC_MESSAGES/gtk-vnc.mo -share/locale/da/LC_MESSAGES/gtk-vnc.mo -share/locale/de/LC_MESSAGES/gtk-vnc.mo -share/locale/el/LC_MESSAGES/gtk-vnc.mo -share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo -share/locale/eo/LC_MESSAGES/gtk-vnc.mo -share/locale/es/LC_MESSAGES/gtk-vnc.mo -share/locale/eu/LC_MESSAGES/gtk-vnc.mo -share/locale/fr/LC_MESSAGES/gtk-vnc.mo -share/locale/gl/LC_MESSAGES/gtk-vnc.mo -share/locale/hu/LC_MESSAGES/gtk-vnc.mo -share/locale/it/LC_MESSAGES/gtk-vnc.mo -share/locale/ja/LC_MESSAGES/gtk-vnc.mo -share/locale/ko/LC_MESSAGES/gtk-vnc.mo -share/locale/nb/LC_MESSAGES/gtk-vnc.mo -share/locale/nds/LC_MESSAGES/gtk-vnc.mo -share/locale/pa/LC_MESSAGES/gtk-vnc.mo -share/locale/pl/LC_MESSAGES/gtk-vnc.mo -share/locale/pt/LC_MESSAGES/gtk-vnc.mo -share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo -share/locale/ro/LC_MESSAGES/gtk-vnc.mo -share/locale/ru/LC_MESSAGES/gtk-vnc.mo -share/locale/sk/LC_MESSAGES/gtk-vnc.mo -share/locale/sl/LC_MESSAGES/gtk-vnc.mo -share/locale/sv/LC_MESSAGES/gtk-vnc.mo -share/locale/th/LC_MESSAGES/gtk-vnc.mo -share/locale/tr/LC_MESSAGES/gtk-vnc.mo -share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo -share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo -share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo -@dirrm include/gtk-vnc-2.0 -@dirrm include/gvnc-1.0 -@dirrmtry share/locale/nds/LC_MESSAGES -@dirrmtry share/locale/nds -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 9982884d4..1a285b244 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -12,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc3 \ +LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \ libavahi-core.so:${PORTSDIR}/net/avahi-app \ libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 \ libgdbm.so:${PORTSDIR}/databases/gdbm \ |