[pkgsrc/trunk]: pkgsrc/textproc/xapian-omega Normalize patch filenames. No fu...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccb215b1387d
branches:  trunk
changeset: 365054:ccb215b1387d
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jul 09 22:31:23 2017 +0000

description:
Normalize patch filenames. No functional change.

diffstat:

 textproc/xapian-omega/distinfo                  |   6 +-
 textproc/xapian-omega/patches/patch-Makefile.in |  44 +++++++++++++++++++++++++
 textproc/xapian-omega/patches/patch-aa          |  44 -------------------------
 textproc/xapian-omega/patches/patch-ab          |  27 ---------------
 textproc/xapian-omega/patches/patch-omega.conf  |  27 +++++++++++++++
 5 files changed, 74 insertions(+), 74 deletions(-)

diffs (173 lines):

diff -r 7d00ee64fcef -r ccb215b1387d textproc/xapian-omega/distinfo
--- a/textproc/xapian-omega/distinfo    Sun Jul 09 22:27:55 2017 +0000
+++ b/textproc/xapian-omega/distinfo    Sun Jul 09 22:31:23 2017 +0000
@@ -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
diff -r 7d00ee64fcef -r ccb215b1387d textproc/xapian-omega/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian-omega/patches/patch-Makefile.in   Sun Jul 09 22:31:23 2017 +0000
@@ -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)
diff -r 7d00ee64fcef -r ccb215b1387d textproc/xapian-omega/patches/patch-aa
--- a/textproc/xapian-omega/patches/patch-aa    Sun Jul 09 22:27:55 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2017/07/09 22:27:47 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)
diff -r 7d00ee64fcef -r ccb215b1387d textproc/xapian-omega/patches/patch-ab
--- a/textproc/xapian-omega/patches/patch-ab    Sun Jul 09 22:27:55 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2016/11/07 13:02:45 schmonz Exp $
-
-Respect ${VARBASE} and follow hier(7).
-
---- omega.conf.orig    2016-10-21 04:54:32.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
diff -r 7d00ee64fcef -r ccb215b1387d textproc/xapian-omega/patches/patch-omega.conf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian-omega/patches/patch-omega.conf    Sun Jul 09 22:31:23 2017 +0000
@@ -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