Date: Mon, 27 Oct 2003 17:52:52 +0900 (JST) From: Takahiro Morishita (=?iso-2022-jp?B?GyRCPzkyPBsoQiAbJEI1Lk01GyhC?=) <morishita@skywing.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marcus@FreeBSD.org Subject: ports/58593: [non-maintainer update] net/gaim Message-ID: <20031027.175252.74716586.morishita@falcon.next-generation.org> Resent-Message-ID: <200310270900.h9R90ahB043561@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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@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@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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031027.175252.74716586.morishita>