summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2006-08-26 19:15:08 +0000
committerRenato Botelho <garga@FreeBSD.org>2006-08-26 19:15:08 +0000
commit93812aa17a91cf0f9e3f9a83752705f0346e463e (patch)
tree72be9e8209ce33aa0c5fff9d7e04fcc8d537433f /japanese
parent- Fix a glitch when both WITHOUT_X11 and WITH_GTK* are defined (diff)
Unregister CONFLICTS with recently removed net-im/gaim-devel
Notes
Notes: svn path=/head/; revision=171448
Diffstat (limited to 'japanese')
-rw-r--r--japanese/gaim/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/japanese/gaim/Makefile b/japanese/gaim/Makefile
index e151169dd9d3..f1cbd4b877da 100644
--- a/japanese/gaim/Makefile
+++ b/japanese/gaim/Makefile
@@ -16,6 +16,6 @@ MAINTAINER= freebsd@next-generation.org
MASTERDIR= ${.CURDIR}/../../net-im/gaim
MD5_FILE= ${.CURDIR}/distinfo
-CONFLICTS= gaim-[0-9]* gaim-devel-[0-9]*
+CONFLICTS= gaim-[0-9]*
.include "${MASTERDIR}/Makefile"