CVS commit: pkgsrc/textproc/xapian-omega

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jul  9 22:31:23 UTC 2017

Modified Files:
        pkgsrc/textproc/xapian-omega: distinfo
Added Files:
        pkgsrc/textproc/xapian-omega/patches: patch-Makefile.in
            patch-omega.conf
Removed Files:
        pkgsrc/textproc/xapian-omega/patches: patch-aa patch-ab

Log Message:
Normalize patch filenames. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/xapian-omega/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in \
    pkgsrc/textproc/xapian-omega/patches/patch-omega.conf
cvs rdiff -u -r1.9 -r0 pkgsrc/textproc/xapian-omega/patches/patch-aa
cvs rdiff -u -r1.4 -r0 pkgsrc/textproc/xapian-omega/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xapian-omega/distinfo
diff -u pkgsrc/textproc/xapian-omega/distinfo:1.21 pkgsrc/textproc/xapian-omega/distinfo:1.22
--- pkgsrc/textproc/xapian-omega/distinfo:1.21  Sun Jul  9 22:27:47 2017
+++ pkgsrc/textproc/xapian-omega/distinfo       Sun Jul  9 22:31:23 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2017/07/09 22:27:47 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2017/07/09 22:31:23 schmonz Exp $
 
 SHA1 (xapian-omega-1.4.4.tar.xz) = 96f01b801157244945833f3d3e478bc730f3395d
 RMD160 (xapian-omega-1.4.4.tar.xz) = 7a143c26353900b3bbb2a12c82a0ef46fcc048bd
 SHA512 (xapian-omega-1.4.4.tar.xz) = 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533
 Size (xapian-omega-1.4.4.tar.xz) = 501712 bytes
-SHA1 (patch-aa) = eea809d9403820e86478d939a2dad4c67358ebf5
-SHA1 (patch-ab) = 6de115aab051256e911d61d69255f5af8916f058
+SHA1 (patch-Makefile.in) = eea809d9403820e86478d939a2dad4c67358ebf5
+SHA1 (patch-omega.conf) = f1e941dac326de7005cad0a5a4a2848e401855c4

Added files:

Index: pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in:1.1
--- /dev/null   Sun Jul  9 22:31:23 2017
+++ pkgsrc/textproc/xapian-omega/patches/patch-Makefile.in      Sun Jul  9 22:31:23 2017
@@ -0,0 +1,44 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/07/09 22:31:23 schmonz Exp $
+
+Call it "xapian-omega" and follow hier(7).
+
+--- Makefile.in.orig   2017-04-24 02:19:50.000000000 +0000
++++ Makefile.in
+@@ -92,7 +92,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-pkglibbin_PROGRAMS = omega$(EXEEXT)
++pkglibbin_PROGRAMS = xapian-omega$(EXEEXT)
+ bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) \
+       omindex-list$(EXEEXT)
+ check_PROGRAMS = atomparsetest$(EXEEXT) csvesctest$(EXEEXT) \
+@@ -791,7 +791,7 @@ AM_CPPFLAGS = \
+       -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
+       -DPKGLIBBINDIR=\"$(pkglibbindir)\"
+ 
+-pkglibbindir = $(pkglibdir)/bin
++pkglibbindir = $(libexecdir)/cgi-bin
+ dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text
+ dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
+ dist_check_SCRIPTS = omegatest
+@@ -804,7 +804,7 @@ TESTS = atomparsetest$(EXEEXT)\
+       urlenctest$(EXEEXT)\
+       utf8converttest$(EXEEXT)
+ 
+-omegadatadir = $(datadir)/omega
++omegadatadir = $(datadir)/xapian-omega
+ dist_omegadata_DATA = htdig2omega.script mbox2omega.script
+ dist_sysconf_DATA = omega.conf
+ 
+@@ -1099,8 +1099,8 @@ md5test$(EXEEXT): $(md5test_OBJECTS) $(m
+ common/str.$(OBJEXT): common/$(am__dirstamp) \
+       common/$(DEPDIR)/$(am__dirstamp)
+ 
+-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) 
+-      @rm -f omega$(EXEEXT)
++xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) 
++      @rm -f xapian-omega$(EXEEXT)
+       $(AM_V_CXXLD)$(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS)
+ common/getopt.$(OBJEXT): common/$(am__dirstamp) \
+       common/$(DEPDIR)/$(am__dirstamp)
Index: pkgsrc/textproc/xapian-omega/patches/patch-omega.conf
diff -u /dev/null pkgsrc/textproc/xapian-omega/patches/patch-omega.conf:1.1
--- /dev/null   Sun Jul  9 22:31:23 2017
+++ pkgsrc/textproc/xapian-omega/patches/patch-omega.conf       Sun Jul  9 22:31:23 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-omega.conf,v 1.1 2017/07/09 22:31:23 schmonz Exp $
+
+Respect ${VARBASE} and follow hier(7).
+
+--- omega.conf.orig    2017-04-24 02:19:20.000000000 +0000
++++ omega.conf
+@@ -1,8 +1,8 @@
+ # Directory containing Xapian databases:
+-database_dir /var/lib/omega/data
++database_dir @VARBASE@/xapian-omega/data
+ 
+ # Directory containing OmegaScript templates:
+-template_dir /var/lib/omega/templates
++template_dir @VARBASE@/xapian-omega/templates
+ 
+ # Default template name if the CGI parameter "FMT" is not specified.
+ # (If not specified here, the default template name is "query"):
+@@ -13,7 +13,7 @@ template_dir /var/lib/omega/templates
+ #default_db default
+ 
+ # Directory to write Omega logs to:
+-log_dir /var/log/omega
++log_dir @VARBASE@/log/xapian-omega
+ 
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+-cdb_dir /var/lib/omega/cdb
++cdb_dir @VARBASE@/xapian-omega/cdb