Date: Fri, 21 Apr 2000 12:01:27 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18136: Update port: databases/xmbase-grok to 1.4.3 (fix ports/17461) Message-ID: <200004211901.MAA26564@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18136
>Category: ports
>Synopsis: Update port: databases/xmbase-grok to 1.4.3 (fix ports/17461)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 21 12:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.4.3
- Add WWW: line into pkg/DESCR
Remove file:
patches/patch-aa patches/patch-ab
This PR supersedes ports/17461.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/databases/xmbase-grok/Makefile databases/xmbase-grok/Makefile
--- /usr/ports/databases/xmbase-grok/Makefile Sun Apr 9 15:44:05 2000
+++ databases/xmbase-grok/Makefile Thu Apr 20 07:04:47 2000
@@ -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/
@@ -16,5 +16,13 @@
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 -urN /usr/ports/databases/xmbase-grok/files/md5 databases/xmbase-grok/files/md5
--- /usr/ports/databases/xmbase-grok/files/md5 Fri Feb 12 06:54:00 1999
+++ databases/xmbase-grok/files/md5 Tue Mar 14 20:57:54 2000
@@ -1 +1 @@
-MD5 (xmbase-grok-1.4.1.tar.gz) = 42df70b36ff70ff58bd12f8240e2007f
+MD5 (xmbase-grok-1.4.3.tar.gz) = 18afe43ac405c5af4303fcba92fda357
diff -urN /usr/ports/databases/xmbase-grok/patches/patch-aa databases/xmbase-grok/patches/patch-aa
--- /usr/ports/databases/xmbase-grok/patches/patch-aa Sat Aug 30 22:25:05 1997
+++ databases/xmbase-grok/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
---- popup.c.orig Sat Aug 30 13:43:08 1997
-+++ popup.c Sat Aug 30 13:43:31 1997
-@@ -74,7 +74,9 @@
- * away. The widget is some window that the popup goes on top of.
- */
-
-+#ifndef __FreeBSD__
- extern char *sys_errlist[]; /* hpux9.01 errno.h is broken! */
-+#endif
-
- /*VARARGS*/
- void create_error_popup(Widget widget, int error, char *fmt, ...)
diff -urN /usr/ports/databases/xmbase-grok/patches/patch-ab databases/xmbase-grok/patches/patch-ab
--- /usr/ports/databases/xmbase-grok/patches/patch-ab Sat Aug 30 22:25:05 1997
+++ databases/xmbase-grok/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,14 +0,0 @@
---- template.c.orig Sat Aug 30 13:58:51 1997
-+++ template.c Sat Aug 30 13:59:36 1997
-@@ -6,9 +6,11 @@
-
- #include "config.h"
- #ifdef DIRECT
-+#include <sys/types.h>
- #include <sys/dir.h>
- #define dirent direct
- #else
-+#include <sys/types.h>
- #include <dirent.h>
- #endif
- #include <X11/Xos.h>
diff -urN /usr/ports/databases/xmbase-grok/patches/patch-ac databases/xmbase-grok/patches/patch-ac
--- /usr/ports/databases/xmbase-grok/patches/patch-ac Fri Feb 12 11:41:39 1999
+++ databases/xmbase-grok/patches/patch-ac Tue Mar 14 21:52:12 2000
@@ -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 -urN /usr/ports/databases/xmbase-grok/pkg/DESCR databases/xmbase-grok/pkg/DESCR
--- /usr/ports/databases/xmbase-grok/pkg/DESCR Sat Aug 30 22:25:06 1997
+++ databases/xmbase-grok/pkg/DESCR Tue Mar 14 21:01:14 2000
@@ -6,3 +6,5 @@
* 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 -urN /usr/ports/databases/xmbase-grok/pkg/PLIST databases/xmbase-grok/pkg/PLIST
--- /usr/ports/databases/xmbase-grok/pkg/PLIST Sat Aug 30 22:25:06 1997
+++ databases/xmbase-grok/pkg/PLIST Tue Mar 14 21:58:34 2000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004211901.MAA26564>