From 592adcf45fb172a0698286e551b59abd2d35c3c6 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 10 Feb 2007 23:43:20 +0000 Subject: Sync with the FreeBSD ports tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8290 df743ca5-7f9a-e211-a948-0013205c9059 --- net-im/libgaim/Makefile | 6 +++--- net-im/libgaim/files/patch-gaim.service.in | 7 +++++++ net-im/libpurple/Makefile | 6 +++--- net-im/libpurple/files/patch-gaim.service.in | 7 +++++++ 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 net-im/libgaim/files/patch-gaim.service.in create mode 100644 net-im/libpurple/files/patch-gaim.service.in diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile index 23cd53065..1f7f956b2 100644 --- a/net-im/libgaim/Makefile +++ b/net-im/libgaim/Makefile @@ -3,12 +3,12 @@ # Whom: Jim Mock # # $FreeBSD$ -# $MCom: ports/net-im/libgaim/Makefile,v 1.6 2007/02/02 18:05:42 mezz Exp $ +# $MCom: ports/net-im/libgaim/Makefile,v 1.7 2007/02/04 00:29:25 marcus Exp $ # PORTNAME= gaim PORTVERSION= 2.0.0.b6 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -138,7 +138,7 @@ PLIST_SUB+= SILC="@comment not installed: " .endif .if !defined(WITHOUT_BONJOUR) -LIB_DEPENDS+= avahi-core.4:${PORTSDIR}/net/avahi +LIB_DEPENDS+= avahi-core.5:${PORTSDIR}/net/avahi PLIST_SUB+= BONJOUR="" PRPL_MODULES:= ${PRPL_MODULES},bonjour .else diff --git a/net-im/libgaim/files/patch-gaim.service.in b/net-im/libgaim/files/patch-gaim.service.in new file mode 100644 index 000000000..333f6c27d --- /dev/null +++ b/net-im/libgaim/files/patch-gaim.service.in @@ -0,0 +1,7 @@ +--- gaim.service.in.orig Tue Feb 6 20:55:54 2007 ++++ gaim.service.in Tue Feb 6 20:56:04 2007 +@@ -1,3 +1,3 @@ + [D-BUS Service] +-Name=org.gaim.GaimService ++Name=net.sf.gaim.GaimService + Exec=@bindir@/gaim diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 23cd53065..1f7f956b2 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -3,12 +3,12 @@ # Whom: Jim Mock # # $FreeBSD$ -# $MCom: ports/net-im/libgaim/Makefile,v 1.6 2007/02/02 18:05:42 mezz Exp $ +# $MCom: ports/net-im/libgaim/Makefile,v 1.7 2007/02/04 00:29:25 marcus Exp $ # PORTNAME= gaim PORTVERSION= 2.0.0.b6 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -138,7 +138,7 @@ PLIST_SUB+= SILC="@comment not installed: " .endif .if !defined(WITHOUT_BONJOUR) -LIB_DEPENDS+= avahi-core.4:${PORTSDIR}/net/avahi +LIB_DEPENDS+= avahi-core.5:${PORTSDIR}/net/avahi PLIST_SUB+= BONJOUR="" PRPL_MODULES:= ${PRPL_MODULES},bonjour .else diff --git a/net-im/libpurple/files/patch-gaim.service.in b/net-im/libpurple/files/patch-gaim.service.in new file mode 100644 index 000000000..333f6c27d --- /dev/null +++ b/net-im/libpurple/files/patch-gaim.service.in @@ -0,0 +1,7 @@ +--- gaim.service.in.orig Tue Feb 6 20:55:54 2007 ++++ gaim.service.in Tue Feb 6 20:56:04 2007 +@@ -1,3 +1,3 @@ + [D-BUS Service] +-Name=org.gaim.GaimService ++Name=net.sf.gaim.GaimService + Exec=@bindir@/gaim -- cgit v1.2.3