Add ghex2 after a repo copy from ghex. ghex2 is a hexidecimal editor for

the GNOME 2 desktop.

6 files changed, 143 insertions, 104 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 8b5fb0f2237..6191139ff80 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -51,6 +51,7 @@
     SUBDIR += gedit
     SUBDIR += gedit2
     SUBDIR += ghex
+    SUBDIR += ghex2
     SUBDIR += glimmer
     SUBDIR += gmanedit
     SUBDIR += gnotepad+
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 69c0f702465..fe8eaffe73b 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -1,22 +1,29 @@
-# New ports collection makefile for:	ghex
-# Date created:				9th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	ghex2
+# Date created:				15 September 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	ghex
-PORTVERSION=	1.2.1
+PORTNAME=	ghex2
+PORTVERSION=	1.99.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/ghex
+MASTER_SITE_SUBDIR=	2.0.2/sources/${PORTNAME:S/2$//}
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
+LIB_DEPENDS=	gailutil.17:${PORTSDIR}/x11-toolkits/gail \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs gnomeprint
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/editors/ghex2/distinfo b/editors/ghex2/distinfo
index 12da24803a5..7f34d293e35 100644
--- a/editors/ghex2/distinfo
+++ b/editors/ghex2/distinfo
@@ -1 +1 @@
-MD5 (ghex-1.2.1.tar.gz) = 2ec336790ca1e5e475152520cead78e5
+MD5 (gnome2/ghex-1.99.1.tar.bz2) = 8553cb2f7ade98093e040bc456df60e1
diff --git a/editors/ghex2/files/patch-configure b/editors/ghex2/files/patch-configure
new file mode 100644
index 00000000000..c1377e529eb
--- /dev/null
+++ b/editors/ghex2/files/patch-configure
@@ -0,0 +1,51 @@
+--- configure.orig	Sun Sep 15 03:22:13 2002
++++ configure	Sun Sep 15 03:23:02 2002
+@@ -8164,23 +8164,23 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for gail >= 1.0.0" >&5
+-echo $ECHO_N "checking for gail >= 1.0.0... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for gail >= 0.17" >&5
++echo $ECHO_N "checking for gail >= 0.17... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "gail >= 1.0.0" ; then
++        if $PKG_CONFIG --exists "gail >= 0.17" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking GAILUTIL_CFLAGS" >&5
+ echo $ECHO_N "checking GAILUTIL_CFLAGS... $ECHO_C" >&6
+-            GAILUTIL_CFLAGS=`$PKG_CONFIG --cflags "gail >= 1.0.0"`
++            GAILUTIL_CFLAGS=`$PKG_CONFIG --cflags "gail >= 0.17"`
+             echo "$as_me:$LINENO: result: $GAILUTIL_CFLAGS" >&5
+ echo "${ECHO_T}$GAILUTIL_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking GAILUTIL_LIBS" >&5
+ echo $ECHO_N "checking GAILUTIL_LIBS... $ECHO_C" >&6
+-            GAILUTIL_LIBS=`$PKG_CONFIG --libs "gail >= 1.0.0"`
++            GAILUTIL_LIBS=`$PKG_CONFIG --libs "gail >= 0.17"`
+             echo "$as_me:$LINENO: result: $GAILUTIL_LIBS" >&5
+ echo "${ECHO_T}$GAILUTIL_LIBS" >&6
+         else
+@@ -8188,7 +8188,7 @@
+             GAILUTIL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            GAILUTIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gail >= 1.0.0"`
++            GAILUTIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gail >= 0.17"`
+             echo $GAILUTIL_PKG_ERRORS
+         fi
+ 
+@@ -8203,8 +8203,8 @@
+   if test $succeeded = yes; then
+      :
+   else
+-     { { echo "$as_me:$LINENO: error: Library requirements (gail >= 1.0.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-echo "$as_me: error: Library requirements (gail >= 1.0.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++     { { echo "$as_me:$LINENO: error: Library requirements (gail >= 0.17) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements (gail >= 0.17) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ 
diff --git a/editors/ghex2/pkg-comment b/editors/ghex2/pkg-comment
index f55f49eb31e..ea010c6d301 100644
--- a/editors/ghex2/pkg-comment
+++ b/editors/ghex2/pkg-comment
@@ -1 +1 @@
-GNOME hex editor
+GNOME 2 hex editor
diff --git a/editors/ghex2/pkg-plist b/editors/ghex2/pkg-plist
index 8f9be9f988c..0d6f89cda6b 100644
--- a/editors/ghex2/pkg-plist
+++ b/editors/ghex2/pkg-plist
@@ -1,96 +1,76 @@
-bin/ghex
-share/gnome/apps/Applications/ghex.desktop
-share/gnome/help/ghex/C/docbook.css
-share/gnome/help/ghex/C/ghex.sgml
-share/gnome/help/ghex/C/ghexconverter.png
-share/gnome/help/ghex/C/ghexdisplaypref.png
-share/gnome/help/ghex/C/ghexfind.png
-share/gnome/help/ghex/C/ghexfindreplace.png
-share/gnome/help/ghex/C/ghexfullwindow.png
-share/gnome/help/ghex/C/ghexmdiprefs.png
-share/gnome/help/ghex/C/ghexmenubar.png
-share/gnome/help/ghex/C/ghexmenues.html
-share/gnome/help/ghex/C/ghexprefedit.png
-share/gnome/help/ghex/C/ghexprintprefs.png
-share/gnome/help/ghex/C/index.html
-share/gnome/help/ghex/C/stylesheet-images/caution.gif
-share/gnome/help/ghex/C/stylesheet-images/home.gif
-share/gnome/help/ghex/C/stylesheet-images/important.gif
-share/gnome/help/ghex/C/stylesheet-images/next.gif
-share/gnome/help/ghex/C/stylesheet-images/note.gif
-share/gnome/help/ghex/C/stylesheet-images/prev.gif
-share/gnome/help/ghex/C/stylesheet-images/tip.gif
-share/gnome/help/ghex/C/stylesheet-images/toc-blank.gif
-share/gnome/help/ghex/C/stylesheet-images/toc-minus.gif
-share/gnome/help/ghex/C/stylesheet-images/toc-plus.gif
-share/gnome/help/ghex/C/stylesheet-images/up.gif
-share/gnome/help/ghex/C/stylesheet-images/warning.gif
-share/gnome/help/ghex/C/topic.dat
-share/gnome/help/ghex/C/usage.html
-share/gnome/help/ghex/ja/docbook.css
-share/gnome/help/ghex/ja/ghex.sgml
-share/gnome/help/ghex/ja/ghexconverter.png
-share/gnome/help/ghex/ja/ghexdisplaypref.png
-share/gnome/help/ghex/ja/ghexfind.png
-share/gnome/help/ghex/ja/ghexfindreplace.png
-share/gnome/help/ghex/ja/ghexfullwindow.png
-share/gnome/help/ghex/ja/ghexmdiprefs.png
-share/gnome/help/ghex/ja/ghexmenubar.png
-share/gnome/help/ghex/ja/ghexmenues.html
-share/gnome/help/ghex/ja/ghexprefedit.png
-share/gnome/help/ghex/ja/ghexprintprefs.png
-share/gnome/help/ghex/ja/index.html
-share/gnome/help/ghex/ja/stylesheet-images/caution.gif
-share/gnome/help/ghex/ja/stylesheet-images/home.gif
-share/gnome/help/ghex/ja/stylesheet-images/important.gif
-share/gnome/help/ghex/ja/stylesheet-images/next.gif
-share/gnome/help/ghex/ja/stylesheet-images/note.gif
-share/gnome/help/ghex/ja/stylesheet-images/prev.gif
-share/gnome/help/ghex/ja/stylesheet-images/tip.gif
-share/gnome/help/ghex/ja/stylesheet-images/toc-blank.gif
-share/gnome/help/ghex/ja/stylesheet-images/toc-minus.gif
-share/gnome/help/ghex/ja/stylesheet-images/toc-plus.gif
-share/gnome/help/ghex/ja/stylesheet-images/up.gif
-share/gnome/help/ghex/ja/stylesheet-images/warning.gif
-share/gnome/help/ghex/ja/topic.dat
-share/gnome/help/ghex/ja/usage.html
-share/gnome/omf/ghex/ghex-C.omf
-share/gnome/omf/ghex/ghex-ja.omf
+bin/ghex2
+etc/gconf/gconf.xml.defaults/apps/ghex2/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/ghex2/%gconf.xml
+etc/gconf/schemas/ghex2.schemas
+share/gnome/applications/ghex.desktop
+share/gnome/gnome-2.0/ui/ghex-ui.xml
+share/gnome/help/ghex2/ja/authors.html
+share/gnome/help/ghex2/ja/ghex2.sgml
+share/gnome/help/ghex2/ja/ghexconversion.html
+share/gnome/help/ghex2/ja/ghexconverter.png
+share/gnome/help/ghex2/ja/ghexdisplaypref.png
+share/gnome/help/ghex2/ja/ghexediting.html
+share/gnome/help/ghex2/ja/ghexfind.png
+share/gnome/help/ghex2/ja/ghexfindreplace.html
+share/gnome/help/ghex2/ja/ghexfindreplace.png
+share/gnome/help/ghex2/ja/ghexfullwindow.png
+share/gnome/help/ghex2/ja/ghexmdiprefs.png
+share/gnome/help/ghex2/ja/ghexmenubar.png
+share/gnome/help/ghex2/ja/ghexmenues.html
+share/gnome/help/ghex2/ja/ghexprefedit.png
+share/gnome/help/ghex2/ja/ghexprintprefs.png
+share/gnome/help/ghex2/ja/index.html
+share/gnome/help/ghex2/ja/license.html
+share/gnome/help/ghex2/ja/prefs.html
+share/gnome/help/ghex2/ja/topic.dat
+share/gnome/help/ghex2/ja/usage.html
+share/gnome/help/ghex2/C/figures/ghex_window_empty.png
+share/gnome/help/ghex2/C/figures/ghex_window_open.png
+share/gnome/help/ghex2/C/ghex2.xml
+share/gnome/help/ghex2/C/legal.xml
+share/gnome/help/ghex2/C/topic.dat
 share/gnome/pixmaps/gnome-ghex.png
-share/locale/ca/LC_MESSAGES/ghex.mo
-share/locale/cs/LC_MESSAGES/ghex.mo
-share/locale/da/LC_MESSAGES/ghex.mo
-share/locale/de/LC_MESSAGES/ghex.mo
-share/locale/el/LC_MESSAGES/ghex.mo
-share/locale/en_GB/LC_MESSAGES/ghex.mo
-share/locale/es/LC_MESSAGES/ghex.mo
-share/locale/et/LC_MESSAGES/ghex.mo
-share/locale/fi/LC_MESSAGES/ghex.mo
-share/locale/fr/LC_MESSAGES/ghex.mo
-share/locale/ga/LC_MESSAGES/ghex.mo
-share/locale/gl/LC_MESSAGES/ghex.mo
-share/locale/hu/LC_MESSAGES/ghex.mo
-share/locale/it/LC_MESSAGES/ghex.mo
-share/locale/ja/LC_MESSAGES/ghex.mo
-share/locale/ko/LC_MESSAGES/ghex.mo
-share/locale/nl/LC_MESSAGES/ghex.mo
-share/locale/no/LC_MESSAGES/ghex.mo
-share/locale/pl/LC_MESSAGES/ghex.mo
-share/locale/pt/LC_MESSAGES/ghex.mo
-share/locale/pt_BR/LC_MESSAGES/ghex.mo
-share/locale/ro/LC_MESSAGES/ghex.mo
-share/locale/ru/LC_MESSAGES/ghex.mo
-share/locale/sk/LC_MESSAGES/ghex.mo
-share/locale/sl/LC_MESSAGES/ghex.mo
-share/locale/sv/LC_MESSAGES/ghex.mo
-share/locale/tr/LC_MESSAGES/ghex.mo
-share/locale/uk/LC_MESSAGES/ghex.mo
-share/locale/wa/LC_MESSAGES/ghex.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/ghex.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/ghex.mo
-@dirrm share/gnome/omf/ghex
-@dirrm share/gnome/help/ghex/ja/stylesheet-images
-@dirrm share/gnome/help/ghex/ja
-@dirrm share/gnome/help/ghex/C/stylesheet-images
-@dirrm share/gnome/help/ghex/C
-@dirrm share/gnome/help/ghex
+share/locale/bg/LC_MESSAGES/ghex-2.0.mo
+share/locale/ca/LC_MESSAGES/ghex-2.0.mo
+share/locale/cs/LC_MESSAGES/ghex-2.0.mo
+share/locale/da/LC_MESSAGES/ghex-2.0.mo
+share/locale/de/LC_MESSAGES/ghex-2.0.mo
+share/locale/el/LC_MESSAGES/ghex-2.0.mo
+share/locale/en_GB/LC_MESSAGES/ghex-2.0.mo
+share/locale/es/LC_MESSAGES/ghex-2.0.mo
+share/locale/et/LC_MESSAGES/ghex-2.0.mo
+share/locale/eu/LC_MESSAGES/ghex-2.0.mo
+share/locale/fi/LC_MESSAGES/ghex-2.0.mo
+share/locale/fr/LC_MESSAGES/ghex-2.0.mo
+share/locale/ga/LC_MESSAGES/ghex-2.0.mo
+share/locale/gl/LC_MESSAGES/ghex-2.0.mo
+share/locale/hr/LC_MESSAGES/ghex-2.0.mo
+share/locale/hu/LC_MESSAGES/ghex-2.0.mo
+share/locale/it/LC_MESSAGES/ghex-2.0.mo
+share/locale/ja/LC_MESSAGES/ghex-2.0.mo
+share/locale/ko/LC_MESSAGES/ghex-2.0.mo
+share/locale/ms/LC_MESSAGES/ghex-2.0.mo
+share/locale/nl/LC_MESSAGES/ghex-2.0.mo
+share/locale/nn/LC_MESSAGES/ghex-2.0.mo
+share/locale/no/LC_MESSAGES/ghex-2.0.mo
+share/locale/pl/LC_MESSAGES/ghex-2.0.mo
+share/locale/pt/LC_MESSAGES/ghex-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/ghex-2.0.mo
+share/locale/ro/LC_MESSAGES/ghex-2.0.mo
+share/locale/ru/LC_MESSAGES/ghex-2.0.mo
+share/locale/sk/LC_MESSAGES/ghex-2.0.mo
+share/locale/sl/LC_MESSAGES/ghex-2.0.mo
+share/locale/sv/LC_MESSAGES/ghex-2.0.mo
+share/locale/tr/LC_MESSAGES/ghex-2.0.mo
+share/locale/uk/LC_MESSAGES/ghex-2.0.mo
+share/locale/vi/LC_MESSAGES/ghex-2.0.mo
+share/locale/wa/LC_MESSAGES/ghex-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/ghex-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo
+@dirrm share/gnome/help/ghex2/C/figures
+@dirrm share/gnome/help/ghex2/C
+@dirrm share/gnome/help/ghex2/ja/stylesheet-images
+@dirrm share/gnome/help/ghex2/ja
+@dirrm share/gnome/help/ghex2
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ghex2
+@dirrm etc/gconf/gconf.xml.defaults/apps/ghex2