From 3b4acd3405c2ec27a10b45ee8d761f81e872b870 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 1 Nov 2003 00:49:40 +0000 Subject: * Sync with the master port * Add a CONFLICTS for net/gaim PR: 58594 Submitted by: Takahiro Morishita --- japanese/gaim/Makefile | 8 +++++--- japanese/gaim/distinfo | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'japanese/gaim') diff --git a/japanese/gaim/Makefile b/japanese/gaim/Makefile index ad7eebf0cf22..a667994c3d2e 100644 --- a/japanese/gaim/Makefile +++ b/japanese/gaim/Makefile @@ -7,13 +7,15 @@ CATEGORIES= japanese net -PATCH_SITES= http://www.cc.rim.or.jp/~yaz/ -PATCHFILES= gaim-0.71_jp.patch.gz -PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://www.cc.rim.or.jp/~yaz/:jp_patch +PATCHFILES= gaim-0.71_jp.patch.gz:jp_patch +PATCH_DIST_STRIP= -p1:jp_patch MAINTAINER= morishita@skywing.org MASTERDIR= ${.CURDIR}/../../net/gaim MD5_FILE= ${.CURDIR}/distinfo +CONFLICTS= gaim-* + .include "${MASTERDIR}/Makefile" diff --git a/japanese/gaim/distinfo b/japanese/gaim/distinfo index bc3529a0a873..e994b25e109a 100644 --- a/japanese/gaim/distinfo +++ b/japanese/gaim/distinfo @@ -1,2 +1,3 @@ MD5 (gaim-0.71.tar.bz2) = 89d1aeabdfcb16df479031b08ad5fb99 +MD5 (gaim-0.71-openssl.patch.gz) = a0ecd16191e99724a7897d4c3cf05797 MD5 (gaim-0.71_jp.patch.gz) = 3eac380f9eb1830ab9cbb410acc36f24 -- cgit v1.2.3