diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-misc/htdig | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-misc/htdig')
-rw-r--r-- | www-misc/htdig/Manifest | 1 | ||||
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch | 61 | ||||
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch | 15 | ||||
-rw-r--r-- | www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch | 26 | ||||
-rw-r--r-- | www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild | 66 | ||||
-rw-r--r-- | www-misc/htdig/metadata.xml | 5 |
6 files changed, 174 insertions, 0 deletions
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest new file mode 100644 index 000000000000..fb72d6f63610 --- /dev/null +++ b/www-misc/htdig/Manifest @@ -0,0 +1 @@ +DIST htdig-3.2.0b6.tar.gz 3104936 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 WHIRLPOOL 63b0635873a24ad84c62fb85b6f9e645b3166630a4db52948604e6179f5f41978ef3c1b663122e8e5b74173c2e1cad269d4d92c5e678dcaf4dbac06d6b930cf3 diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch new file mode 100644 index 000000000000..bf455ea8b637 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch @@ -0,0 +1,61 @@ +--- htdig-3.2.0b6/Makefile.config.orig 2006-11-19 08:49:57.000000000 -0800 ++++ htdig-3.2.0b6/Makefile.config 2006-11-19 08:51:19.000000000 -0800 +@@ -22,10 +22,7 @@ + $(LOCAL_DEFINES) $(PROFILING) + + HTLIBS= $(top_builddir)/htnet/libhtnet.la \ +- $(top_builddir)/htcommon/libcommon.la \ +- $(top_builddir)/htword/libhtword.la \ + $(top_builddir)/htlib/libht.la \ + $(top_builddir)/htcommon/libcommon.la \ + $(top_builddir)/htword/libhtword.la \ +- $(top_builddir)/db/libhtdb.la \ +- $(top_builddir)/htlib/libht.la ++ $(top_builddir)/db/libhtdb.la +--- htdig-3.2.0b6/htlib/Makefile.am.orig 2006-11-19 09:13:47.000000000 -0800 ++++ htdig-3.2.0b6/htlib/Makefile.am 2006-11-19 09:17:50.000000000 -0800 +@@ -1,7 +1,8 @@ + include $(top_srcdir)/Makefile.config + + pkglib_LTLIBRARIES = libht.la +- ++libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la ++libht_la_LIBADD= $(top_builddir)/db/libhtdb.la + libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \ + DB2_db.cc IntObject.cc List.cc Object.cc \ + ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \ +@@ -17,9 +18,6 @@ + myqsort.c \ + md5.cc mhash_md5.c + +-libht_la_LIBADD=@LTLIBOBJS@ +-# this includes regex.c +- + libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags} + + pkginclude_HEADERS = \ +--- htdig-3.2.0b6/htword/Makefile.am.orig 2006-11-19 08:55:08.000000000 -0800 ++++ htdig-3.2.0b6/htword/Makefile.am 2006-11-19 08:56:51.000000000 -0800 +@@ -10,7 +10,8 @@ + LOCAL_DEFINES = + + pkglib_LTLIBRARIES = libhtword.la +- ++libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la ++libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la + libhtword_la_SOURCES = \ + WordBitCompress.cc \ + WordContext.cc \ + +--- htdig-3.2.0b6/htcommon/Makefile.am.orig 2006-11-19 09:32:39.000000000 -0800 ++++ htdig-3.2.0b6/htcommon/Makefile.am 2006-11-19 09:33:42.000000000 -0800 +@@ -12,7 +12,8 @@ + EXTRA_DIST=conf_lexer.cxx conf_parser.cxx + + pkglib_LTLIBRARIES = libcommon.la +- ++libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la ++libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la + libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \ + HtWordReference.cc HtWordList.cc defaults.cc \ + HtURLCodec.cc URL.cc URLTrans.cc \ diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch new file mode 100644 index 000000000000..58dec13957e2 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch @@ -0,0 +1,15 @@ +diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h +--- htdig-3.2.0b6.orig/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700 ++++ htdig-3.2.0b6/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800 +@@ -36,9 +36,9 @@ public: + const char *docExcerpt); + ~Collection(); + +- void Collection::Open(); ++ void Open(); + +- void Collection::Close(); ++ void Close(); + + char *getWordFile() { return wordFile.get(); } + DocumentRef *getDocumentRef(int id); diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch new file mode 100644 index 000000000000..57b0e3b78731 --- /dev/null +++ b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch @@ -0,0 +1,26 @@ +Index: htdig-3.2.0b6/htsearch/Display.cc +=================================================================== +--- htdig-3.2.0b6.orig/htsearch/Display.cc ++++ htdig-3.2.0b6/htsearch/Display.cc +@@ -137,7 +137,7 @@ Display::display(int pageNumber) + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char*)config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + return; +Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc +=================================================================== +--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc ++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc +@@ -142,7 +142,7 @@ ResultFetch::fetch() + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char *) config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + //return; diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild new file mode 100644 index 000000000000..7fb321645887 --- /dev/null +++ b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit eutils autotools + +MY_PV=${PV/_beta/b} +S=${WORKDIR}/${PN}-${MY_PV} + +DESCRIPTION="HTTP/HTML indexing and searching system" +HOMEPAGE="http://www.htdig.org" +SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +IUSE="ssl" + +DEPEND=">=sys-libs/zlib-1.1.3 + app-arch/unzip + ssl? ( dev-libs/openssl )" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-quoting.patch + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die + eautoreconf +} + +src_compile() { + use prefix || EPREFIX= + + econf \ + --with-config-dir="${EPREFIX}"/etc/${PN} \ + --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \ + --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \ + --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \ + --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ + --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ + $(use_with ssl) + +# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \ + + emake || die "emake failed" +} + +src_install () { + use prefix || ED="${D}" + + emake DESTDIR="${D}" install || die "make install failed" + + dodoc ChangeLog README + dohtml -r htdoc + + sed -i "s:${D}::g" \ + "${ED}"/etc/${PN}/${PN}.conf \ + "${ED}"/usr/bin/rundig \ + || die "sed failed (removing \${D} from installed files)" + + # symlink htsearch so it can be easily found. see bug #62087 + dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch +} diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml new file mode 100644 index 000000000000..95c06f0095bb --- /dev/null +++ b/www-misc/htdig/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>web-apps</herd> +</pkgmetadata> |