summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/avahi/Makefile37
-rw-r--r--net/gtk-vnc3/Makefile15
-rw-r--r--net/vinagre/Makefile10
3 files changed, 32 insertions, 30 deletions
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index b34f61a46..6fbc9ef2e 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,6 +1,6 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/net/avahi/Makefile 17268 2013-04-01 05:13:11Z marcus $
+# $FreeBSD: head/net/avahi/Makefile 314632 2013-03-19 10:40:22Z kwm $
+# $MCom$
PORTNAME= avahi
PORTVERSION= 0.6.31
@@ -14,48 +14,47 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The "meta-port" for the Avahi service discovery suite
RUN_DEPENDS= avahi-resolve:${PORTSDIR}/net/avahi-app \
- avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app
+ avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
-OPTIONS= AUTOIPD "IPv4LL network address configuration daemon" off \
- GTK "Gtk+ tools and bindings" off \
- LIBDNS "Apple's mDNSResponder compatibility library" off \
- MONO "Mono bindings" off \
- QT3 "Qt 3 bindings" off \
- QT4 "Qt 4 bindings" off \
- PYTHON "Python bindings and tools" off
+OPTIONS_DEFINE= AUTOIPD GTK LIBDNS MONO QT3 QT4 PYTHON
+OPTIONS_DEFAULT=AUTOIPD GTK LIBDNS
+AUTOIPD_DESC= IPv4LL network address configuration daemon
+GTK_DESC= Gtk+ tools and bindings
+LIBDNS_DESC= Apple's mDNSResponder compatibility library
+QT3_DESC= Qt 3 toolkit
NO_BUILD= yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_AUTOIPD)
+.if ${PORT_OPTIONS:MAUTOIPD}
RUN_DEPENDS+= avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
.endif
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK}
RUN_DEPENDS+= avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
.endif
-.if defined(WITH_LIBDNS)
+.if ${PORT_OPTIONS:MLIBDNS}
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
.endif
-.if defined(WITH_MONO)
+.if ${PORT_OPTIONS:MMONO}
RUN_DEPENDS+= ${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
.endif
-.if defined(WITH_QT3)
+.if ${PORT_OPTIONS:MQT3}
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
.endif
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
.endif
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
RUN_DEPENDS+= avahi-bookmarks:${PORTSDIR}/net/py-avahi
.endif
do-install:
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/gtk-vnc3/Makefile b/net/gtk-vnc3/Makefile
index 12c11461a..69ab9f9fa 100644
--- a/net/gtk-vnc3/Makefile
+++ b/net/gtk-vnc3/Makefile
@@ -14,19 +14,20 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
gcrypt:${PORTSDIR}/security/libgcrypt \
sasl2:${PORTSDIR}/security/cyrus-sasl2
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING.LIB
+
CONFLICTS= gtk-vnc-0.3.[0-9]*
-USE_XZ= yes
LATEST_LINK= gtk-vnc3
-LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USE_GNOME= gnomehack gtk30
+USE_XZ= yes
+USE_GNOME= gtk30
USE_GMAKE= yes
-USE_GETTEXT= yes
+USES= gettext pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gtk=3.0 --disable-introspection \
--disable-plugin --without-python
MAN1= gvnccapture.1
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 559a2aa26..025fff57e 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -35,11 +35,13 @@ GCONF_SCHEMAS= vinagre.schemas
MAN1= vinagre.1
-OPTIONS= TELEPATHY "Enable telepathy integration" on
+OPTIONS_DEFINE= TELEPATHY
+OPTIONS_DEFAULT=TELEPATHY
+TELEPATHY_DESC= Telepathy integration
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_TELEPATHY)
+.if ${PORT_OPTIONS:MTELEPATHY}
CONFIGURE_ARGS+=--enable-telepathy
LIB_DEPENDS+= telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
PLIST_SUB+= TELEPATHY=""
@@ -49,7 +51,7 @@ PLIST_SUB+= TELEPATHY="@comment "
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}