From 9e3b216a7ed3c8fd72d6cbea9cc28e82a4d97d23 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Wed, 8 Aug 2001 05:32:12 +0000 Subject: [PATCH] o Update to 1.5 o USE_X_PREFIX o Support NOPORTDOCS PR: 29440 Submitted by: Kato Tsuguru --- databases/xmbase-grok/Makefile | 42 +++++++++++----- databases/xmbase-grok/distinfo | 2 +- databases/xmbase-grok/files/patch-ac | 72 ---------------------------- databases/xmbase-grok/pkg-plist | 12 +++-- 4 files changed, 41 insertions(+), 87 deletions(-) delete mode 100644 databases/xmbase-grok/files/patch-ac diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile index 35c51d9c6915..a8dfc2b94c63 100644 --- a/databases/xmbase-grok/Makefile +++ b/databases/xmbase-grok/Makefile @@ -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 -GLOK_DATADIR= ${PREFIX}/lib/X11/xmbase-grok +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} +pre-patch: + @${PERL} -pi -e 's|^GBIN =|#GBIN =|g ; \ + s|^GLIB =|#GLIB =|g ; \ + s|^DEBUG =|#DEBUG =|g' ${BUILD_WRKSRC}/Makefile + +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 diff --git a/databases/xmbase-grok/distinfo b/databases/xmbase-grok/distinfo index 8cdab7bef182..f3b9a24a64a5 100644 --- a/databases/xmbase-grok/distinfo +++ b/databases/xmbase-grok/distinfo @@ -1 +1 @@ -MD5 (xmbase-grok-1.4.3.tar.gz) = 18afe43ac405c5af4303fcba92fda357 +MD5 (xmbase_grok-1.5.tar.gz) = fd7631c0ef566cb8c124b429bbc81423 diff --git a/databases/xmbase-grok/files/patch-ac b/databases/xmbase-grok/files/patch-ac deleted file mode 100644 index 618b5c60d657..000000000000 --- a/databases/xmbase-grok/files/patch-ac +++ /dev/null @@ -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 --git a/databases/xmbase-grok/pkg-plist b/databases/xmbase-grok/pkg-plist index 3dad30939750..14377671f2c4 100644 --- a/databases/xmbase-grok/pkg-plist +++ b/databases/xmbase-grok/pkg-plist @@ -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.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 @@ -33,6 +30,15 @@ lib/X11/xmbase-grok/grokdir/weather.gf 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