Date: Fri, 3 Aug 2001 21:01:50 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/29440: Update port: databases/xmbase-grok to 1.5 Message-ID: <200108040401.f7441o252940@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 29440
>Category: ports
>Synopsis: Update port: databases/xmbase-grok to 1.5
>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 Aug 03 21:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.5
Remove file:
files/patch-ac
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/databases/xmbase-grok/Makefile databases/xmbase-grok/Makefile
--- /usr/ports/databases/xmbase-grok/Makefile Wed Nov 8 08:27:58 2000
+++ databases/xmbase-grok/Makefile Sat Jul 28 18:00:22 2001
@@ -6,23 +6,43 @@
#
PORTNAME= xmbase-grok
-PORTVERSION= 1.4.3
+PORTVERSION= 1.5
CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
- ftp://ftp.fu-berlin.de/pub/unix/databases/xmbase-grok/
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/databases/xmbase-grok/ \
+ ftp://bitrot.de/pub/grok/
+DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src
+
+USE_X_PREFIX= yes
USE_MOTIF= yes
-USE_IMAKE= yes
+MAKE_ENV= MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \
+ GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \
+ CF="-I${X11BASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm"
+MAN1= grok.1
+
+DATADIR= ${PREFIX}/lib/X11/xmbase-grok
-GLOK_DATADIR= ${PREFIX}/lib/X11/xmbase-grok
+pre-patch:
+ @${PERL} -pi -e 's|^GBIN =|#GBIN =|g ; \
+ s|^GLIB =|#GLIB =|g ; \
+ s|^DEBUG =|#DEBUG =|g' ${BUILD_WRKSRC}/Makefile
-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}
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/grok ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man/grok.1 ${MANPREFIX}/man/man1
+ @${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/misc/grok.hlp ${DATADIR}
+ @${MKDIR} ${DATADIR}/grokdir
+ @${TAR} -C ${WRKSRC}/demo -cf - . | \
+ ${TAR} -C ${DATADIR}/grokdir -xf -
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/grokdir
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/databases/xmbase-grok/distinfo databases/xmbase-grok/distinfo
--- /usr/ports/databases/xmbase-grok/distinfo Sun Apr 30 06:14:36 2000
+++ databases/xmbase-grok/distinfo Sat Jul 28 15:40:06 2001
@@ -1 +1 @@
-MD5 (xmbase-grok-1.4.3.tar.gz) = 18afe43ac405c5af4303fcba92fda357
+MD5 (xmbase_grok-1.5.tar.gz) = fd7631c0ef566cb8c124b429bbc81423
diff -urN /usr/ports/databases/xmbase-grok/files/patch-ac databases/xmbase-grok/files/patch-ac
--- /usr/ports/databases/xmbase-grok/files/patch-ac Sun Apr 30 06:14:39 2000
+++ databases/xmbase-grok/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,72 +0,0 @@
---- 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.
- */
-
--GBIN = /usr/local/bin
--GLIB = /usr/local/lib
--
--CDEBUGFLAGS = -O2
--
-+GBIN = $(BINDIR)
-+GLIB = $(LIBDIR)/xmbase-grok
-
- /*
- * Do not change anyhting below.
-@@ -23,7 +20,7 @@
- #ifdef sgi
- LIB = -lSgm -lXm $(XTOOLLIB) $(XLIB) $(SYSLIBS) $(XMEXTRA_LIBS) -lm
- #else
--LIB = -lXm $(XTOOLLIB) $(XLIB) $(SYSLIBS) $(XMEXTRA_LIBS) -lm
-+LIB = $(MOTIFLIB) $(XTOOLLIB) $(XLIB) $(SYSLIBS) $(XMEXTRA_LIBS) -lm
- #endif
-
- SRC = canvdraw.c cardwin.c chart.c chartdrw.c convert.c dbase.c\
-@@ -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)/grokdir)
--InstallMultiple($(DEMO),$(GLIB)/grokdir)
--InstallNonExec(grok.xpm,$(LIBDIR)/pixmaps)
-+InstallNonExec(grok.xpm,$(INCDIR)/X11/pixmaps)
-
-
- $(SRC:.c=.o): config.h grok.h proto.h form.h
-@@ -79,14 +73,18 @@
-
-
- #---------------------------------------------------------------
--Manual.ps: doc/main.dvi
-- dvips -f doc/main.dvi >Manual.ps
-- -rm -f doc/jobname.cont doc/main.cont doc/main.log
--
--
--doc/main.dvi: $(DOC)
-- cd doc; tex main.tex; tex main.tex
-- -rm -f doc/jobname.cont doc/main.cont doc/main.log
-+#
-+# Don't want the need to have TeX installed for the make install target !
-+# -Andreas
-+#
-+#Manual.ps: doc/main.dvi
-+# dvips -f doc/main.dvi >Manual.ps
-+# -rm -f doc/jobname.cont doc/main.cont doc/main.log
-+#
-+#
-+#doc/main.dvi: $(DOC)
-+# cd doc; tex main.tex; tex main.tex
-+# -rm -f doc/jobname.cont doc/main.cont doc/main.log
-
- clean::
- -rm -f y.tab.h y.tab.c lex.yy.c grok y.output *.shar*
diff -urN /usr/ports/databases/xmbase-grok/pkg-plist databases/xmbase-grok/pkg-plist
--- /usr/ports/databases/xmbase-grok/pkg-plist Sun Apr 30 06:14:39 2000
+++ databases/xmbase-grok/pkg-plist Sat Jul 28 16:31:58 2001
@@ -1,7 +1,5 @@
bin/grok
-include/X11/pixmaps/grok.xpm
lib/X11/xmbase-grok/grok.hlp
-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
@@ -11,7 +9,6 @@
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
@@ -33,6 +30,15 @@
lib/X11/xmbase-grok/grokdir/workplan.gf
lib/X11/xmbase-grok/grokdir/www_pages.db
lib/X11/xmbase-grok/grokdir/www_pages.gf
+%%PORTDOCS%%share/doc/xmbase-grok/README
+%%PORTDOCS%%share/doc/xmbase-grok/export.html
+%%PORTDOCS%%share/doc/xmbase-grok/files.html
+%%PORTDOCS%%share/doc/xmbase-grok/formedit.html
+%%PORTDOCS%%share/doc/xmbase-grok/grammar.html
+%%PORTDOCS%%share/doc/xmbase-grok/icon.jpg
+%%PORTDOCS%%share/doc/xmbase-grok/index.html
+%%PORTDOCS%%share/doc/xmbase-grok/intro.html
+%%PORTDOCS%%@dirrm share/doc/xmbase-grok
@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?200108040401.f7441o252940>