5 files changed, 49 insertions, 22 deletions

diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index 3f957bad97c7..f921dd743280 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmbase-grok
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.fu-berlin.de/pub/unix/databases/xmbase-grok/
@@ -17,4 +17,12 @@ MAINTAINER=	ports@FreeBSD.org
 REQUIRES_MOTIF=	yes
 USE_IMAKE=	yes
 
+GLOK_DATADIR=	${PREFIX}/lib/X11/xmbase-grok
+
+post-install:
+	${TAR} -C ${WRKSRC} -cf - grokdir | \
+		${TAR} -C ${GLOK_DATADIR} --unlink -xf -
+	find ${GLOK_DATADIR} | xargs ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+	find ${GLOK_DATADIR} -type f | xargs ${CHMOD} ${SHAREMODE}
+
 .include <bsd.port.mk>
diff --git a/databases/xmbase-grok/distinfo b/databases/xmbase-grok/distinfo
index bd23bfff800b..8cdab7bef182 100644
--- a/databases/xmbase-grok/distinfo
+++ b/databases/xmbase-grok/distinfo
@@ -1 +1 @@
-MD5 (xmbase-grok-1.4.1.tar.gz) = 42df70b36ff70ff58bd12f8240e2007f
+MD5 (xmbase-grok-1.4.3.tar.gz) = 18afe43ac405c5af4303fcba92fda357
diff --git a/databases/xmbase-grok/files/patch-ac b/databases/xmbase-grok/files/patch-ac
index 7de6fd293f03..618b5c60d657 100644
--- a/databases/xmbase-grok/files/patch-ac
+++ b/databases/xmbase-grok/files/patch-ac
@@ -1,5 +1,5 @@
---- Imakefile.orig	Thu Jul 10 10:33:34 1997
-+++ Imakefile	Thu Feb 11 18:28:52 1999
+--- Imakefile.orig	Fri Nov 12 03:28:53 1999
++++ Imakefile	Tue Mar 14 21:48:50 2000
 @@ -10,11 +10,8 @@
   * GLIB. The documentation (Manual.ps) is not installed, that's up to you.
   */
@@ -9,8 +9,8 @@
 -
 -CDEBUGFLAGS = -O2
 -
-+GBIN = ${X11BASE}/bin
-+GLIB = ${X11BASE}/lib/X11/xmbase-grok
++GBIN = $(BINDIR)
++GLIB = $(LIBDIR)/xmbase-grok
  
  /*
   * Do not change anyhting below.
@@ -23,20 +23,27 @@
  #endif
  
  SRC  =	canvdraw.c cardwin.c chart.c chartdrw.c convert.c dbase.c\
-@@ -55,10 +52,10 @@
+@@ -37,17 +34,14 @@
+ DOC  =	doc/files.tex doc/formedit.tex doc/grammar.tex doc/intro.tex\
+ 	doc/macro.tex doc/main.tex doc/export.tex
+ 
+-DEMO =	grokdir/*
+-
+ EXTRA_DEFINES = -DPATH=\"$(GBIN):$(GLIB)\" -DLIB=\"$(GLIB)\"
+ EXTRA_LIBS=-lXpm
  AllTarget(grok)
  NormalProgramTarget(grok,y.tab.o $(SRC:.c=.o),,,$(LIB))
  InstallProgram(grok,$(GBIN))
 -InstallProgram(grok.hlp,$(GLIB))
 +InstallNonExecFile(grok.hlp,$(GLIB))
- InstallMultiple(Manual.ps grok.hlp,$(GLIB))
- InstallMultiple($(DEMO),$(GLIB)/grokdir)
+ InstallMultiple(Manual.ps grok.hlp,$(GLIB)/grokdir)
+-InstallMultiple($(DEMO),$(GLIB)/grokdir)
 -InstallNonExec(grok.xpm,$(LIBDIR)/pixmaps)
-+InstallNonExec(grok.xpm,$(X11BASE)/include/X11/pixmaps)
++InstallNonExec(grok.xpm,$(INCDIR)/X11/pixmaps)
  
  
  $(SRC:.c=.o): config.h grok.h proto.h form.h
-@@ -90,14 +87,18 @@
+@@ -79,14 +73,18 @@
  
  
  #---------------------------------------------------------------
diff --git a/databases/xmbase-grok/pkg-descr b/databases/xmbase-grok/pkg-descr
index 4d21cca0e75e..66f4aaebd296 100644
--- a/databases/xmbase-grok/pkg-descr
+++ b/databases/xmbase-grok/pkg-descr
@@ -6,3 +6,5 @@ and UI builder that can -
   *  keep todo lists
   *  manage any other database after simple GUI-driven customization
   *  customized data export, HTML export built in
+
+WWW: http://me.in-berlin.de/~bitrot/grok.html
diff --git a/databases/xmbase-grok/pkg-plist b/databases/xmbase-grok/pkg-plist
index ebce6c1d2a4e..3dad30939750 100644
--- a/databases/xmbase-grok/pkg-plist
+++ b/databases/xmbase-grok/pkg-plist
@@ -1,28 +1,38 @@
 bin/grok
 include/X11/pixmaps/grok.xpm
 lib/X11/xmbase-grok/grok.hlp
-lib/X11/xmbase-grok/Manual.ps
+lib/X11/xmbase-grok/grokdir/Manual.ps
+lib/X11/xmbase-grok/grokdir/biblio.db
+lib/X11/xmbase-grok/grokdir/biblio.gf
+lib/X11/xmbase-grok/grokdir/biblio.mktex.pl
+lib/X11/xmbase-grok/grokdir/checkbook.db
+lib/X11/xmbase-grok/grokdir/checkbook.gf
 lib/X11/xmbase-grok/grokdir/countries.db
 lib/X11/xmbase-grok/grokdir/countries.gf
+lib/X11/xmbase-grok/grokdir/diary.db
+lib/X11/xmbase-grok/grokdir/diary.gf
+lib/X11/xmbase-grok/grokdir/grok.hlp
+lib/X11/xmbase-grok/grokdir/howto.gf
+lib/X11/xmbase-grok/grokdir/music.gf
+lib/X11/xmbase-grok/grokdir/occasions.gf
+lib/X11/xmbase-grok/grokdir/passwd.gf
 lib/X11/xmbase-grok/grokdir/phone.db
 lib/X11/xmbase-grok/grokdir/phone.gf
+lib/X11/xmbase-grok/grokdir/phone2.gf
+lib/X11/xmbase-grok/grokdir/phone2.tm/Palm-Pilot
 lib/X11/xmbase-grok/grokdir/phonelog.db
 lib/X11/xmbase-grok/grokdir/phonelog.gf
-lib/X11/xmbase-grok/grokdir/todo.db
-lib/X11/xmbase-grok/grokdir/todo.gf
-lib/X11/xmbase-grok/grokdir/diary.db
-lib/X11/xmbase-grok/grokdir/diary.gf
-lib/X11/xmbase-grok/grokdir/passwd.gf
 lib/X11/xmbase-grok/grokdir/procdemo
 lib/X11/xmbase-grok/grokdir/procdemo.gf
+lib/X11/xmbase-grok/grokdir/systems
+lib/X11/xmbase-grok/grokdir/systems.gf
+lib/X11/xmbase-grok/grokdir/todo.db
+lib/X11/xmbase-grok/grokdir/todo.gf
 lib/X11/xmbase-grok/grokdir/weather.db
 lib/X11/xmbase-grok/grokdir/weather.gf
-lib/X11/xmbase-grok/grokdir/checkbook.db
-lib/X11/xmbase-grok/grokdir/checkbook.gf
+lib/X11/xmbase-grok/grokdir/workplan.gf
 lib/X11/xmbase-grok/grokdir/www_pages.db
 lib/X11/xmbase-grok/grokdir/www_pages.gf
-lib/X11/xmbase-grok/grokdir/biblio.db
-lib/X11/xmbase-grok/grokdir/biblio.gf
-lib/X11/xmbase-grok/grokdir/biblio.mktex.pl
+@dirrm lib/X11/xmbase-grok/grokdir/phone2.tm
 @dirrm lib/X11/xmbase-grok/grokdir
 @dirrm lib/X11/xmbase-grok