Date: Mon, 27 Jan 2014 21:56:04 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341463 - in head/textproc/glimpse: . files Message-ID: <201401272156.s0RLu42v023983@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jan 27 21:56:04 2014 New Revision: 341463 URL: http://svnweb.freebsd.org/changeset/ports/341463 QAT: https://qat.redports.org/buildarchive/r341463/ Log: - Convert to staging - Rename patches to follow makepatch naming. Sponsored by: Absolight Added: head/textproc/glimpse/files/patch-Makefile.in - copied, changed from r341458, head/textproc/glimpse/files/patch-ad head/textproc/glimpse/files/patch-agrep__Makefile.in - copied, changed from r341445, head/textproc/glimpse/files/patch-ae head/textproc/glimpse/files/patch-agrep__agrep.c - copied, changed from r341445, head/textproc/glimpse/files/patch-aa head/textproc/glimpse/files/patch-agrep__sgrep.c - copied, changed from r341445, head/textproc/glimpse/files/patch-aj head/textproc/glimpse/files/patch-compress__Makefile.in - copied, changed from r341445, head/textproc/glimpse/files/patch-ah head/textproc/glimpse/files/patch-compress__main_tbuild.c - copied, changed from r341445, head/textproc/glimpse/files/patch-compress-main_tbuild.c head/textproc/glimpse/files/patch-compress__misc.c - copied, changed from r341445, head/textproc/glimpse/files/patch-compress-misc.c head/textproc/glimpse/files/patch-index__Makefile.in - copied, changed from r341445, head/textproc/glimpse/files/patch-ai head/textproc/glimpse/files/patch-index__build_in.c - copied, changed from r341445, head/textproc/glimpse/files/patch-index-build_in.c head/textproc/glimpse/files/patch-index__glimpse.c - copied, changed from r341445, head/textproc/glimpse/files/patch-index-glimpse.c head/textproc/glimpse/files/patch-index__io.c - copied, changed from r341445, head/textproc/glimpse/files/patch-index-io.c head/textproc/glimpse/files/patch-index__region.c - copied, changed from r341445, head/textproc/glimpse/files/patch-index-region.c head/textproc/glimpse/files/patch-libtemplate__include__autoconf.h.in - copied, changed from r341445, head/textproc/glimpse/files/patch-ab head/textproc/glimpse/files/patch-libtemplate__template__Makefile.in - copied, changed from r341445, head/textproc/glimpse/files/patch-ag head/textproc/glimpse/files/patch-libtemplate__util__Makefile.in - copied, changed from r341445, head/textproc/glimpse/files/patch-af head/textproc/glimpse/files/patch-main.c - copied, changed from r341445, head/textproc/glimpse/files/patch-ac Deleted: head/textproc/glimpse/files/patch-aa head/textproc/glimpse/files/patch-ab head/textproc/glimpse/files/patch-ac head/textproc/glimpse/files/patch-ad head/textproc/glimpse/files/patch-ae head/textproc/glimpse/files/patch-af head/textproc/glimpse/files/patch-ag head/textproc/glimpse/files/patch-ah head/textproc/glimpse/files/patch-ai head/textproc/glimpse/files/patch-aj head/textproc/glimpse/files/patch-compress-main_tbuild.c head/textproc/glimpse/files/patch-compress-misc.c head/textproc/glimpse/files/patch-index-build_in.c head/textproc/glimpse/files/patch-index-glimpse.c head/textproc/glimpse/files/patch-index-io.c head/textproc/glimpse/files/patch-index-region.c Modified: head/textproc/glimpse/Makefile head/textproc/glimpse/files/patch-get_filename.c head/textproc/glimpse/files/patch-get_index.c head/textproc/glimpse/pkg-plist Modified: head/textproc/glimpse/Makefile ============================================================================== --- head/textproc/glimpse/Makefile Mon Jan 27 21:54:50 2014 (r341462) +++ head/textproc/glimpse/Makefile Mon Jan 27 21:56:04 2014 (r341463) @@ -11,22 +11,21 @@ COMMENT= Text search engine MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= DOCS + PORTDOCS= README COPYRIGHT +USES= desthack NO_CDROM= Restrictive copyright (don not sell for profit) GNU_CONFIGURE= yes CFLAGS+= -DISO_CHAR_SET=1 -D__STRICT_ANSI__ -MAN1= glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1 -NO_STAGE= yes pre-configure: @${CHMOD} a+x ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}/ -.endif - @${INSTALL_PROGRAM} ${WRKSRC}/index/wgconvert ${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/index/wgconvert ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Copied and modified: head/textproc/glimpse/files/patch-Makefile.in (from r341458, head/textproc/glimpse/files/patch-ad) ============================================================================== --- head/textproc/glimpse/files/patch-ad Mon Jan 27 21:30:25 2014 (r341458, copy source) +++ head/textproc/glimpse/files/patch-Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,17 +1,23 @@ ---- Makefile.in.orig Sat Jul 24 01:24:43 1999 -+++ Makefile.in Fri May 5 21:52:52 2000 -@@ -35,7 +35,7 @@ +--- ./Makefile.in.orig 1999-11-01 20:34:49.000000000 +0000 ++++ ./Makefile.in 2014-01-27 21:42:55.000000000 +0000 +@@ -33,9 +33,9 @@ + TEMPLATESRC = $(srcdir)/$(TEMPLATEDIR) + COMPRESSDIR = compress COMPRESSSRC = $(srcdir)/$(COMPRESSDIR) - DESTDIR = $(srcdir)/bin +-DESTDIR = $(srcdir)/bin ++SRCDIR = $(srcdir)/bin -CFLAGS = @CFLAGS@ -O -DSTRUCTURED_QUERIES=1 +CFLAGS = -O @CFLAGS@ -DSTRUCTURED_QUERIES=1 ALL_CFLAGS = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include LINKFLAGS = @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include -@@ -85,11 +85,11 @@ +@@ -83,13 +83,13 @@ + all: $(PROGINDEX) $(PROGAGREP) $(PROG) $(PROGSERVER) + install: all installdirs - cd $(DESTDIR) ;\ +- cd $(DESTDIR) ;\ ++ cd $(SRCDIR) ;\ for f in $(ALL_PROGS) ; do \ - $(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix)$(f) ;\ + $(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix) ;\ @@ -23,3 +29,30 @@ done # $(INSTALL_PROGRAM) $(PROGINDEX) $(bindir)/$(binprefix)glimpseindex # $(INSTALL_PROGRAM) $(PROGAGREP) $(bindir)/$(binprefix)agrep +@@ -114,13 +114,13 @@ + + $(PROG): main.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a + $(CC) $(LINKFLAGS) -L$(AGREPDIR) -L$(COMPRESSDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROG) main.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) +- $(CP) $(PROG) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(PROG) ; fi ++ $(CP) $(PROG) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(PROG) ; fi + + $(PROGSERVER): main_server.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a + $(CC) $(LINKFLAGS) -L$(COMPRESSDIR) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROGSERVER) main_server.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS) +- $(CP) $(PROGSERVER) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(PROGSERVER) ; fi ++ $(CP) $(PROGSERVER) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(PROGSERVER) ; fi + + $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a: + cd $(TEMPLATEDIR) ; $(MAKE) +@@ -137,7 +137,7 @@ + cd $(INDEXDIR) ; $(MAKE) clean + cd $(COMPRESSDIR); $(MAKE) clean + cd $(TEMPLATEDIR); $(MAKE) clean +- cd $(DESTDIR) ; rm -f $(ALL_PROGS) ++ cd $(SRCDIR) ; rm -f $(ALL_PROGS) + + distclean: clean + -rm -f Makefile config.cache config.status Copied and modified: head/textproc/glimpse/files/patch-agrep__Makefile.in (from r341445, head/textproc/glimpse/files/patch-ae) ============================================================================== --- head/textproc/glimpse/files/patch-ae Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-agrep__Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,11 +1,36 @@ ---- agrep/Makefile.in~ Thu Nov 21 12:58:44 1996 -+++ agrep/Makefile.in Thu Apr 8 23:04:27 1999 -@@ -28,7 +28,7 @@ +--- ./agrep/Makefile.in.orig 1999-11-01 20:33:54.000000000 +0000 ++++ ./agrep/Makefile.in 2014-01-27 21:42:55.000000000 +0000 +@@ -30,9 +30,9 @@ + TCOMPDIR = ../compress TCOMPSRC = $(srcdir)/../compress TEMPLATESRC = $(srcdir)/../libtemplate +-DESTDIR = $(srcdir)/../bin ++SRCDIR = $(srcdir)/../bin -CFLAGS = @CFLAGS@ -O -DDOTCOMPRESSED=0 -I$(TEMPLATESRC)/include +CFLAGS = -O @CFLAGS@ -DDOTCOMPRESSED=0 -I$(TEMPLATESRC)/include ALL_CFLAGS = $(CFLAGS) $(DEFS) LINKFLAGS = @LINKFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include +@@ -87,8 +87,8 @@ + $(CC) -L$(TCOMPDIR) $(CFLAGS) -o $@ $(OBJS) main.o -l$(TCOMP) + $(AR) rcv $(LIB) $(OBJS) + $(RANLIB) $(LIB) +- $(CP) $(PROG) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(PROG) ; fi ++ $(CP) $(PROG) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(PROG) ; fi + + $(TCOMPDIR)/lib$(TCOMP).a: + cd $(TCOMPDIR) ; $(MAKE) +@@ -97,8 +97,8 @@ + $(CC) $(CFLAGS) -o $(PROG) $(OBJS) dummyfilters.o main.o + $(AR) rcv $(LIB) $(OBJS) dummyfilters.o + $(RANLIB) $(LIB) +- $(CP) $(PROG) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(PROG) ; fi ++ $(CP) $(PROG) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(PROG) ; fi + + clean: + -rm -f $(LIB) $(OBJS) dummyfilters.o main.o core a.out $(PROG) Copied and modified: head/textproc/glimpse/files/patch-agrep__agrep.c (from r341445, head/textproc/glimpse/files/patch-aa) ============================================================================== --- head/textproc/glimpse/files/patch-aa Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-agrep__agrep.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,12 +1,10 @@ -*** agrep/agrep.c.orig Thu Aug 22 07:51:14 1996 ---- agrep/agrep.c Thu Aug 22 07:51:27 1996 -*************** -*** 3,8 **** ---- 3,9 ---- - * bgopal: (1993-4) added a library interface and removed some bugs: also - * selectively modified many routines to work with our text-compression algo. - */ -+ #include <sys/types.h> - #include <sys/stat.h> - #include "agrep.h" - #include "checkfile.h" +--- ./agrep/agrep.c.orig 2000-03-08 18:51:03.000000000 +0000 ++++ ./agrep/agrep.c 2014-01-27 21:40:18.000000000 +0000 +@@ -3,6 +3,7 @@ + * bgopal: (1993-4) added a library interface and removed some bugs: also + * selectively modified many routines to work with our text-compression algo. + */ ++#include <sys/types.h> + #include <sys/stat.h> + #include "agrep.h" + #include "checkfile.h" Copied and modified: head/textproc/glimpse/files/patch-agrep__sgrep.c (from r341445, head/textproc/glimpse/files/patch-aj) ============================================================================== --- head/textproc/glimpse/files/patch-aj Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-agrep__sgrep.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- agrep/sgrep.c.orig Mon Apr 26 23:15:06 2004 -+++ agrep/sgrep.c Mon Apr 26 23:15:33 2004 +--- ./agrep/sgrep.c.orig 1999-11-01 20:32:58.000000000 +0000 ++++ ./agrep/sgrep.c 2014-01-27 21:40:18.000000000 +0000 @@ -1539,7 +1539,7 @@ hash = TR[*text]; hash = (hash << 3) + TR[*(text-1)]; Copied and modified: head/textproc/glimpse/files/patch-compress__Makefile.in (from r341445, head/textproc/glimpse/files/patch-ah) ============================================================================== --- head/textproc/glimpse/files/patch-ah Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-compress__Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,7 +1,11 @@ ---- compress/Makefile.in~ Thu Apr 8 23:18:20 1999 -+++ compress/Makefile.in Thu Apr 8 23:18:29 1999 -@@ -34,7 +34,7 @@ - +--- ./compress/Makefile.in.orig 1999-11-03 20:40:10.000000000 +0000 ++++ ./compress/Makefile.in 2014-01-27 21:42:55.000000000 +0000 +@@ -34,10 +34,10 @@ + AGREPSRC = $(srcdir)/$(AGREP) + TEMPLATE = ../libtemplate + TEMPLATESRC = $(srcdir)/$(TEMPLATE) +-DESTDIR = $(srcdir)/../bin ++SRCDIR = $(srcdir)/../bin all: lib tbuild cast uncast test -CFLAGS = @CFLAGS@ -O @@ -9,3 +13,28 @@ ALL_CFLAGS = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include .c.o: +@@ -56,18 +56,18 @@ + + tbuild: hash.o string.o misc.o tbuild.o main_tbuild.o defs.h + $(CC) -o tbuild hash.o string.o misc.o tbuild.o main_tbuild.o +- $(CP) tbuild $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/tbuild ; fi ++ $(CP) tbuild $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/tbuild ; fi + + cast: main_cast.o $(LIB) + $(CC) -o cast main_cast.o $(LIBOBJ) +- $(CP) cast $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/cast ; fi ++ $(CP) cast $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/cast ; fi + + uncast: main_uncast.o $(LIB) + $(CC) -o uncast main_uncast.o $(LIBOBJ) +- $(CP) uncast $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/uncast ; fi ++ $(CP) uncast $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/uncast ; fi + + hash.o: defs.h $(INDEXSRC)/glimpse.h + string.o: defs.h $(INDEXSRC)/glimpse.h Copied and modified: head/textproc/glimpse/files/patch-compress__main_tbuild.c (from r341445, head/textproc/glimpse/files/patch-compress-main_tbuild.c) ============================================================================== --- head/textproc/glimpse/files/patch-compress-main_tbuild.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-compress__main_tbuild.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- compress/main_tbuild.c.orig 2012-09-02 23:50:51.000000000 +0000 -+++ compress/main_tbuild.c 2012-09-02 23:52:17.000000000 +0000 +--- ./compress/main_tbuild.c.orig 1999-11-03 20:40:10.000000000 +0000 ++++ ./compress/main_tbuild.c 2014-01-27 21:40:18.000000000 +0000 @@ -25,7 +25,7 @@ int main(argc, argv) Copied and modified: head/textproc/glimpse/files/patch-compress__misc.c (from r341445, head/textproc/glimpse/files/patch-compress-misc.c) ============================================================================== --- head/textproc/glimpse/files/patch-compress-misc.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-compress__misc.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- compress/misc.c.orig 2012-09-02 23:45:51.000000000 +0000 -+++ compress/misc.c 2012-09-02 23:46:13.000000000 +0000 +--- ./compress/misc.c.orig 1999-11-03 20:40:10.000000000 +0000 ++++ ./compress/misc.c 2014-01-27 21:40:18.000000000 +0000 @@ -288,7 +288,7 @@ return 1; } Modified: head/textproc/glimpse/files/patch-get_filename.c ============================================================================== --- head/textproc/glimpse/files/patch-get_filename.c Mon Jan 27 21:54:50 2014 (r341462) +++ head/textproc/glimpse/files/patch-get_filename.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- get_filename.c.orig 2012-09-03 00:16:47.000000000 +0000 -+++ get_filename.c 2012-09-03 00:16:59.000000000 +0000 +--- ./get_filename.c.orig 1998-04-07 15:54:23.000000000 +0000 ++++ ./get_filename.c 2014-01-27 21:40:18.000000000 +0000 @@ -481,7 +481,7 @@ return 0; } Modified: head/textproc/glimpse/files/patch-get_index.c ============================================================================== --- head/textproc/glimpse/files/patch-get_index.c Mon Jan 27 21:54:50 2014 (r341462) +++ head/textproc/glimpse/files/patch-get_index.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- get_index.c.orig 2012-09-03 00:24:59.000000000 +0000 -+++ get_index.c 2012-09-03 00:25:14.000000000 +0000 +--- ./get_index.c.orig 1998-04-07 16:17:54.000000000 +0000 ++++ ./get_index.c 2014-01-27 21:40:18.000000000 +0000 @@ -52,7 +52,7 @@ } Copied and modified: head/textproc/glimpse/files/patch-index__Makefile.in (from r341445, head/textproc/glimpse/files/patch-ai) ============================================================================== --- head/textproc/glimpse/files/patch-ai Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-index__Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,11 +1,39 @@ ---- index/Makefile.in~ Thu Apr 8 23:24:57 1999 -+++ index/Makefile.in Thu Apr 8 23:25:05 1999 -@@ -36,7 +36,7 @@ +--- ./index/Makefile.in.orig 1999-11-01 21:16:29.000000000 +0000 ++++ ./index/Makefile.in 2014-01-27 21:42:55.000000000 +0000 +@@ -38,9 +38,9 @@ + LIBAGREP = agrep LIBTEMPLATE = template LIBUTIL = util +-DESTDIR = $(srcdir)/../bin ++SRCDIR = $(srcdir)/../bin -CFLAGS = @CFLAGS@ -O -DSTRUCTURED_QUERIES=1 +CFLAGS = -O @CFLAGS@ -DSTRUCTURED_QUERIES=1 ALL_CFLAGS = $(CFLAGS) $(DEFS) -I$(AGREPSRC) -I$(TEMPLATESRC)/include LINKFLAGS = @LINKFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include +@@ -66,18 +66,18 @@ + + $(CASTPROG): buildcast.o $(OBJS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(TCOMPDIR)/lib$(TCOMP).a + $(CC) $(CFLAGS) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -L$(TCOMPDIR) -o $(CASTPROG) buildcast.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) +- $(CP) $(CASTPROG) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(CASTPROG) ; fi ++ $(CP) $(CASTPROG) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(CASTPROG) ; fi + + $(PROG): glimpse.o $(OBJS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(TCOMPDIR)/lib$(TCOMP).a + $(CC) $(CFLAGS) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -L$(TCOMPDIR) -o $(PROG) glimpse.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) +- $(CP) $(PROG) $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/$(PROG) ; fi ++ $(CP) $(PROG) $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/$(PROG) ; fi + + wgconvert: convert.o io.o simpletest.o filetype.o region.o memlook.o getword.o $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(TCOMPDIR)/lib$(TCOMP).a + $(CC) $(CFLAGS) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -L$(TCOMPDIR) -o wgconvert convert.o io.o simpletest.o filetype.o region.o memlook.o getword.o -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) +- $(CP) wgconvert $(DESTDIR) +- if test -n "$(STRIP)" ; then $(STRIP) $(DESTDIR)/wgconvert ; fi ++ $(CP) wgconvert $(SRCDIR) ++ if test -n "$(STRIP)" ; then $(STRIP) $(SRCDIR)/wgconvert ; fi + + $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a: + cd $(TEMPLATEDIR) ; $(MAKE) Copied and modified: head/textproc/glimpse/files/patch-index__build_in.c (from r341445, head/textproc/glimpse/files/patch-index-build_in.c) ============================================================================== --- head/textproc/glimpse/files/patch-index-build_in.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-index__build_in.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- index/build_in.c.orig 2012-09-03 00:03:28.000000000 +0000 -+++ index/build_in.c 2012-09-03 00:15:01.000000000 +0000 +--- ./index/build_in.c.orig 1999-11-01 21:19:27.000000000 +0000 ++++ ./index/build_in.c 2014-01-27 21:40:18.000000000 +0000 @@ -44,8 +44,12 @@ extern struct stat excstbuf; extern struct stat incstbuf; Copied and modified: head/textproc/glimpse/files/patch-index__glimpse.c (from r341445, head/textproc/glimpse/files/patch-index-glimpse.c) ============================================================================== --- head/textproc/glimpse/files/patch-index-glimpse.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-index__glimpse.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- ./index/glimpse.c.orig 2007-06-21 22:24:44.000000000 -0500 -+++ ./index/glimpse.c 2007-06-21 22:25:15.000000000 -0500 +--- ./index/glimpse.c.orig 1999-03-02 07:37:55.000000000 +0000 ++++ ./index/glimpse.c 2014-01-27 21:40:18.000000000 +0000 @@ -23,7 +23,7 @@ /* TEMP_DIR is normally defined in ../main.c; if we're building * buildcast, that's not linked in, so we need to define one here. */ @@ -9,6 +9,3 @@ #endif /* BUILDCAST */ extern int indexable_char[256]; extern int GenerateHash; - - - Copied and modified: head/textproc/glimpse/files/patch-index__io.c (from r341445, head/textproc/glimpse/files/patch-index-io.c) ============================================================================== --- head/textproc/glimpse/files/patch-index-io.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-index__io.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- index/io.c.orig 2012-09-02 23:58:26.000000000 +0000 -+++ index/io.c 2012-09-03 00:00:56.000000000 +0000 +--- ./index/io.c.orig 2000-08-14 23:03:58.000000000 +0000 ++++ ./index/io.c 2014-01-27 21:40:18.000000000 +0000 @@ -360,7 +360,7 @@ Copied and modified: head/textproc/glimpse/files/patch-index__region.c (from r341445, head/textproc/glimpse/files/patch-index-region.c) ============================================================================== --- head/textproc/glimpse/files/patch-index-region.c Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-index__region.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- index/region.c.orig 2012-09-02 23:55:48.000000000 +0000 -+++ index/region.c 2012-09-02 23:56:40.000000000 +0000 +--- ./index/region.c.orig 1999-03-02 07:38:34.000000000 +0000 ++++ ./index/region.c 2014-01-27 21:40:18.000000000 +0000 @@ -168,7 +168,7 @@ } Copied and modified: head/textproc/glimpse/files/patch-libtemplate__include__autoconf.h.in (from r341445, head/textproc/glimpse/files/patch-ab) ============================================================================== --- head/textproc/glimpse/files/patch-ab Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-libtemplate__include__autoconf.h.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- libtemplate/include/autoconf.h.in.orig Thu Nov 21 05:28:49 1996 -+++ libtemplate/include/autoconf.h.in Fri May 5 21:23:48 2000 +--- ./libtemplate/include/autoconf.h.in.orig 1999-11-03 21:40:56.000000000 +0000 ++++ ./libtemplate/include/autoconf.h.in 2014-01-27 21:40:18.000000000 +0000 @@ -108,7 +108,7 @@ #undef HAVE_BZERO Copied and modified: head/textproc/glimpse/files/patch-libtemplate__template__Makefile.in (from r341445, head/textproc/glimpse/files/patch-ag) ============================================================================== --- head/textproc/glimpse/files/patch-ag Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-libtemplate__template__Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- libtemplate/template/Makefile.in~ Thu Apr 8 23:16:06 1999 -+++ libtemplate/template/Makefile.in Thu Apr 8 23:16:17 1999 +--- ./libtemplate/template/Makefile.in.orig 1999-11-03 21:41:04.000000000 +0000 ++++ ./libtemplate/template/Makefile.in 2014-01-27 21:42:55.000000000 +0000 @@ -24,7 +24,7 @@ DEBUG = $(DEBUG_TOP) #-O #-g #-DDEBUG DEBUG_LIBS = Copied and modified: head/textproc/glimpse/files/patch-libtemplate__util__Makefile.in (from r341445, head/textproc/glimpse/files/patch-af) ============================================================================== --- head/textproc/glimpse/files/patch-af Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-libtemplate__util__Makefile.in Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- libtemplate/util/Makefile.in~ Thu Apr 8 23:14:47 1999 -+++ libtemplate/util/Makefile.in Thu Apr 8 23:15:06 1999 +--- ./libtemplate/util/Makefile.in.orig 1999-11-03 20:42:14.000000000 +0000 ++++ ./libtemplate/util/Makefile.in 2014-01-27 21:42:55.000000000 +0000 @@ -19,7 +19,7 @@ RANLIB = @RANLIB@ Copied and modified: head/textproc/glimpse/files/patch-main.c (from r341445, head/textproc/glimpse/files/patch-ac) ============================================================================== --- head/textproc/glimpse/files/patch-ac Mon Jan 27 20:05:59 2014 (r341445, copy source) +++ head/textproc/glimpse/files/patch-main.c Mon Jan 27 21:56:04 2014 (r341463) @@ -1,5 +1,5 @@ ---- main.c.orig Fri Jul 9 17:40:18 1999 -+++ main.c Fri Jun 23 15:44:32 2000 +--- ./main.c.orig 2000-08-15 22:07:25.000000000 +0000 ++++ ./main.c 2014-01-27 21:40:18.000000000 +0000 @@ -938,7 +938,7 @@ case 'V' : Modified: head/textproc/glimpse/pkg-plist ============================================================================== --- head/textproc/glimpse/pkg-plist Mon Jan 27 21:54:50 2014 (r341462) +++ head/textproc/glimpse/pkg-plist Mon Jan 27 21:56:04 2014 (r341463) @@ -7,3 +7,7 @@ bin/glimpseserver bin/tbuild bin/uncast bin/wgconvert +man/man1/agrep.1.gz +man/man1/glimpse.1.gz +man/man1/glimpseindex.1.gz +man/man1/glimpseserver.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401272156.s0RLu42v023983>