ports/58593: [non-maintainer update] net/gaim

Mon Oct 27 09:00:37 UTC 2003

>Number:         58593
>Category:       ports
>Synopsis:       [non-maintainer update] net/gaim
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 27 01:00:35 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Takahiro Morishita <morishita at skywing.org>
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD falcon.next-generation.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Oct 26 14:50:31 JST 2003 root at falcon.next-generation.org:/usr/obj/usr/src/sys/vaio i386
>Description:
Make happier for slave port.
(Current Makefile couldn't use from slave port...)

Add CONFLICTS.

>How-To-Repeat:
>Fix:
diff -ruN net/gaim.orig/Makefile net/gaim/Makefile

--- net/gaim.orig/Makefile	Mon Oct 27 16:59:29 2003
+++ net/gaim/Makefile	Mon Oct 27 17:34:29 2003
@@ -12,10 +12,10 @@
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 .if !defined(WITHOUT_OPENSSL)
-PATCH_SITES=		${MASTER_SITE_LOCAL} \
+PATCH_SITES+=		${MASTER_SITE_LOCAL} \
 			http://people.FreeBSD.org/~marcus/
-PATCH_SITE_SUBDIR=	marcus
-PATCHFILES=		${DISTNAME}-openssl.patch.gz
+PATCH_SITE_SUBDIR+=	marcus
+PATCHFILES+=		${DISTNAME}-openssl.patch.gz
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -23,6 +23,8 @@
 COMMENT=	Gtk+-2.0 open-source 'clone' of AOL's Instant Messenger client
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+
+CONFLICTS?=	ja-gaim-*
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
>Release-Note:
>Audit-Trail:
>Unformatted:

