Add CONFLICT with the each others.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15836 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 314 insertions, 1 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
new file mode 100644
index 000000000..eaf4f5dd9
--- /dev/null
+++ b/deskutils/gucharmap/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	gucharmap
+# Date created:				02 Mar 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/deskutils/gucharmap/Makefile,v 1.55 2010/11/20 15:36:29 kwm Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.75 2010/11/13 13:05:08 kwm Exp $
+#
+
+PORTNAME=	gucharmap
+PORTVERSION=	2.32.1
+CATEGORIES=	deskutils gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A Unicode/ISO10646 character map and font viewer
+
+LIB_DEPENDS=	rarian.0:${PORTSDIR}/textproc/rarian
+
+CONFLICTS=	gucharmap-3.[0-9]*
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
+GNU_CONFIGURE=	yes
+INSTALLS_OMF=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	gucharmap.schemas
+
+.include <bsd.port.mk>
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
new file mode 100644
index 000000000..92ddc91dd
--- /dev/null
+++ b/deskutils/gucharmap/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gucharmap-2.32.1.tar.bz2) = fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28
+SIZE (gnome2/gucharmap-2.32.1.tar.bz2) = 3242939
diff --git a/deskutils/gucharmap/pkg-descr b/deskutils/gucharmap/pkg-descr
new file mode 100644
index 000000000..e69361663
--- /dev/null
+++ b/deskutils/gucharmap/pkg-descr
@@ -0,0 +1,4 @@
+gucharmap is a Unicode/ISO10646 character map and font viewer.  It uses
+GTK+ 2, and supports anti-aliased, scalable fonts.
+
+WWW: http://gucharmap.sourceforge.net/
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
new file mode 100644
index 000000000..4ce00b7f9
--- /dev/null
+++ b/deskutils/gucharmap/pkg-plist
@@ -0,0 +1,271 @@
+bin/charmap
+bin/gnome-character-map
+bin/gucharmap
+include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
+include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
+include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
+include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
+include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
+include/gucharmap-2.0/gucharmap/gucharmap.h
+lib/libgucharmap.la
+lib/libgucharmap.so
+lib/libgucharmap.so.7
+libdata/pkgconfig/gucharmap-2.pc
+share/applications/gucharmap.desktop
+share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/C/figures/gucharmap_window.png
+share/gnome/help/gucharmap/C/gucharmap.xml
+share/gnome/help/gucharmap/C/legal.xml
+share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
+share/gnome/help/gucharmap/bg/gucharmap.xml
+share/gnome/help/gucharmap/ca/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/ca/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ca/gucharmap.xml
+share/gnome/help/gucharmap/cs/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/cs/figures/gucharmap_window.png
+share/gnome/help/gucharmap/cs/gucharmap.xml
+share/gnome/help/gucharmap/de/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/de/figures/gucharmap_window.png
+share/gnome/help/gucharmap/de/gucharmap.xml
+share/gnome/help/gucharmap/el/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/el/figures/gucharmap_window.png
+share/gnome/help/gucharmap/el/gucharmap.xml
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
+share/gnome/help/gucharmap/en_GB/gucharmap.xml
+share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/es/figures/gucharmap_window.png
+share/gnome/help/gucharmap/es/gucharmap.xml
+share/gnome/help/gucharmap/fi/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/fi/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fi/gucharmap.xml
+share/gnome/help/gucharmap/fr/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fr/gucharmap.xml
+share/gnome/help/gucharmap/it/figures/gucharmap_window.png
+share/gnome/help/gucharmap/it/gucharmap.xml
+share/gnome/help/gucharmap/it/legal.xml
+share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ja/gucharmap.xml
+share/gnome/help/gucharmap/ja/legal.xml
+share/gnome/help/gucharmap/ko/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ko/gucharmap.xml
+share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/oc/figures/gucharmap_window.png
+share/gnome/help/gucharmap/oc/gucharmap.xml
+share/gnome/help/gucharmap/pt_BR/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/pt_BR/figures/gucharmap_window.png
+share/gnome/help/gucharmap/pt_BR/gucharmap.xml
+share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ru/gucharmap.xml
+share/gnome/help/gucharmap/sv/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
+share/gnome/help/gucharmap/sv/gucharmap.xml
+share/gnome/help/gucharmap/vi/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/vi/figures/gucharmap_window.png
+share/gnome/help/gucharmap/vi/gucharmap.xml
+share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_CN/gucharmap.xml
+share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_HK/gucharmap.xml
+share/gnome/help/gucharmap/zh_HK/legal.xml
+share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_TW/gucharmap.xml
+share/gnome/help/gucharmap/zh_TW/legal.xml
+share/locale/af/LC_MESSAGES/gucharmap.mo
+share/locale/am/LC_MESSAGES/gucharmap.mo
+share/locale/ar/LC_MESSAGES/gucharmap.mo
+share/locale/as/LC_MESSAGES/gucharmap.mo
+share/locale/ast/LC_MESSAGES/gucharmap.mo
+share/locale/az/LC_MESSAGES/gucharmap.mo
+share/locale/be/LC_MESSAGES/gucharmap.mo
+share/locale/be@latin/LC_MESSAGES/gucharmap.mo
+share/locale/bg/LC_MESSAGES/gucharmap.mo
+share/locale/bn/LC_MESSAGES/gucharmap.mo
+share/locale/bn_IN/LC_MESSAGES/gucharmap.mo
+share/locale/br/LC_MESSAGES/gucharmap.mo
+share/locale/bs/LC_MESSAGES/gucharmap.mo
+share/locale/ca/LC_MESSAGES/gucharmap.mo
+share/locale/ca@valencia/LC_MESSAGES/gucharmap.mo
+share/locale/cs/LC_MESSAGES/gucharmap.mo
+share/locale/cy/LC_MESSAGES/gucharmap.mo
+share/locale/da/LC_MESSAGES/gucharmap.mo
+share/locale/de/LC_MESSAGES/gucharmap.mo
+share/locale/dz/LC_MESSAGES/gucharmap.mo
+share/locale/el/LC_MESSAGES/gucharmap.mo
+share/locale/en@shaw/LC_MESSAGES/gucharmap.mo
+share/locale/en_CA/LC_MESSAGES/gucharmap.mo
+share/locale/en_GB/LC_MESSAGES/gucharmap.mo
+share/locale/eo/LC_MESSAGES/gucharmap.mo
+share/locale/es/LC_MESSAGES/gucharmap.mo
+share/locale/et/LC_MESSAGES/gucharmap.mo
+share/locale/eu/LC_MESSAGES/gucharmap.mo
+share/locale/fa/LC_MESSAGES/gucharmap.mo
+share/locale/fi/LC_MESSAGES/gucharmap.mo
+share/locale/fr/LC_MESSAGES/gucharmap.mo
+share/locale/ga/LC_MESSAGES/gucharmap.mo
+share/locale/gl/LC_MESSAGES/gucharmap.mo
+share/locale/gu/LC_MESSAGES/gucharmap.mo
+share/locale/he/LC_MESSAGES/gucharmap.mo
+share/locale/hi/LC_MESSAGES/gucharmap.mo
+share/locale/hr/LC_MESSAGES/gucharmap.mo
+share/locale/hu/LC_MESSAGES/gucharmap.mo
+share/locale/id/LC_MESSAGES/gucharmap.mo
+share/locale/is/LC_MESSAGES/gucharmap.mo
+share/locale/it/LC_MESSAGES/gucharmap.mo
+share/locale/ja/LC_MESSAGES/gucharmap.mo
+share/locale/ka/LC_MESSAGES/gucharmap.mo
+share/locale/kn/LC_MESSAGES/gucharmap.mo
+share/locale/ko/LC_MESSAGES/gucharmap.mo
+share/locale/lt/LC_MESSAGES/gucharmap.mo
+share/locale/lv/LC_MESSAGES/gucharmap.mo
+share/locale/mai/LC_MESSAGES/gucharmap.mo
+share/locale/mi/LC_MESSAGES/gucharmap.mo
+share/locale/mk/LC_MESSAGES/gucharmap.mo
+share/locale/ml/LC_MESSAGES/gucharmap.mo
+share/locale/mn/LC_MESSAGES/gucharmap.mo
+share/locale/mr/LC_MESSAGES/gucharmap.mo
+share/locale/ms/LC_MESSAGES/gucharmap.mo
+share/locale/nb/LC_MESSAGES/gucharmap.mo
+share/locale/ne/LC_MESSAGES/gucharmap.mo
+share/locale/nl/LC_MESSAGES/gucharmap.mo
+share/locale/nn/LC_MESSAGES/gucharmap.mo
+share/locale/oc/LC_MESSAGES/gucharmap.mo
+share/locale/or/LC_MESSAGES/gucharmap.mo
+share/locale/pa/LC_MESSAGES/gucharmap.mo
+share/locale/pl/LC_MESSAGES/gucharmap.mo
+share/locale/pt/LC_MESSAGES/gucharmap.mo
+share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
+share/locale/ro/LC_MESSAGES/gucharmap.mo
+share/locale/ru/LC_MESSAGES/gucharmap.mo
+share/locale/rw/LC_MESSAGES/gucharmap.mo
+share/locale/si/LC_MESSAGES/gucharmap.mo
+share/locale/sk/LC_MESSAGES/gucharmap.mo
+share/locale/sl/LC_MESSAGES/gucharmap.mo
+share/locale/sq/LC_MESSAGES/gucharmap.mo
+share/locale/sr/LC_MESSAGES/gucharmap.mo
+share/locale/sr@latin/LC_MESSAGES/gucharmap.mo
+share/locale/sv/LC_MESSAGES/gucharmap.mo
+share/locale/ta/LC_MESSAGES/gucharmap.mo
+share/locale/te/LC_MESSAGES/gucharmap.mo
+share/locale/th/LC_MESSAGES/gucharmap.mo
+share/locale/tr/LC_MESSAGES/gucharmap.mo
+share/locale/uk/LC_MESSAGES/gucharmap.mo
+share/locale/vi/LC_MESSAGES/gucharmap.mo
+share/locale/wa/LC_MESSAGES/gucharmap.mo
+share/locale/xh/LC_MESSAGES/gucharmap.mo
+share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
+share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
+share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
+share/omf/gucharmap/gucharmap-C.omf
+share/omf/gucharmap/gucharmap-bg.omf
+share/omf/gucharmap/gucharmap-ca.omf
+share/omf/gucharmap/gucharmap-cs.omf
+share/omf/gucharmap/gucharmap-de.omf
+share/omf/gucharmap/gucharmap-el.omf
+share/omf/gucharmap/gucharmap-en_GB.omf
+share/omf/gucharmap/gucharmap-es.omf
+share/omf/gucharmap/gucharmap-fi.omf
+share/omf/gucharmap/gucharmap-fr.omf
+share/omf/gucharmap/gucharmap-it.omf
+share/omf/gucharmap/gucharmap-ja.omf
+share/omf/gucharmap/gucharmap-ko.omf
+share/omf/gucharmap/gucharmap-oc.omf
+share/omf/gucharmap/gucharmap-pt_BR.omf
+share/omf/gucharmap/gucharmap-ru.omf
+share/omf/gucharmap/gucharmap-sv.omf
+share/omf/gucharmap/gucharmap-vi.omf
+share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_HK.omf
+share/omf/gucharmap/gucharmap-zh_TW.omf
+@dirrm share/omf/gucharmap
+@dirrm share/gnome/help/gucharmap/zh_TW/figures
+@dirrm share/gnome/help/gucharmap/zh_TW
+@dirrm share/gnome/help/gucharmap/zh_HK/figures
+@dirrm share/gnome/help/gucharmap/zh_HK
+@dirrm share/gnome/help/gucharmap/zh_CN/figures
+@dirrm share/gnome/help/gucharmap/zh_CN
+@dirrm share/gnome/help/gucharmap/vi/figures
+@dirrm share/gnome/help/gucharmap/vi
+@dirrm share/gnome/help/gucharmap/sv/figures
+@dirrm share/gnome/help/gucharmap/sv
+@dirrm share/gnome/help/gucharmap/ru/figures
+@dirrm share/gnome/help/gucharmap/ru
+@dirrm share/gnome/help/gucharmap/pt_BR/figures
+@dirrm share/gnome/help/gucharmap/pt_BR
+@dirrm share/gnome/help/gucharmap/oc/figures
+@dirrm share/gnome/help/gucharmap/oc
+@dirrm share/gnome/help/gucharmap/ko/figures
+@dirrm share/gnome/help/gucharmap/ko
+@dirrm share/gnome/help/gucharmap/ja/figures
+@dirrm share/gnome/help/gucharmap/ja
+@dirrm share/gnome/help/gucharmap/it/figures
+@dirrm share/gnome/help/gucharmap/it
+@dirrm share/gnome/help/gucharmap/fr/figures
+@dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/fi/figures
+@dirrm share/gnome/help/gucharmap/fi
+@dirrm share/gnome/help/gucharmap/es/figures
+@dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/en_GB/figures
+@dirrm share/gnome/help/gucharmap/en_GB
+@dirrm share/gnome/help/gucharmap/el/figures
+@dirrm share/gnome/help/gucharmap/el
+@dirrm share/gnome/help/gucharmap/de/figures
+@dirrm share/gnome/help/gucharmap/de
+@dirrm share/gnome/help/gucharmap/cs/figures
+@dirrm share/gnome/help/gucharmap/cs
+@dirrm share/gnome/help/gucharmap/ca/figures
+@dirrm share/gnome/help/gucharmap/ca
+@dirrm share/gnome/help/gucharmap/bg/figures
+@dirrm share/gnome/help/gucharmap/bg
+@dirrm share/gnome/help/gucharmap/C/figures
+@dirrm share/gnome/help/gucharmap/C
+@dirrm share/gnome/help/gucharmap
+@dirrmtry share/applications
+@dirrm include/gucharmap-2.0/gucharmap
+@dirrm include/gucharmap-2.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/deskutils/gucharmap3/Makefile b/deskutils/gucharmap3/Makefile
index 0b8f2b71d..9833034bf 100644
--- a/deskutils/gucharmap3/Makefile
+++ b/deskutils/gucharmap3/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap3/Makefile,v 1.1 2011/02/16 12:47:53 kwm Exp $
+#   $MCom: ports/deskutils/gucharmap3/Makefile,v 1.2 2011/04/05 09:31:59 kwm Exp $
 #
 
 PORTNAME=	gucharmap
@@ -15,6 +15,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A Unicode/ISO10646 character map and font viewer
 
+CONFLICTS=	gucharmap-2.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes