summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-05-21 20:41:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-05-21 20:41:47 +0000
commit08eba31266c992745dec890ef7ccec16697bd86b (patch)
treedc680bb9783d5bd0139bf407cfec1b824ea9a93d /dev-util/httpup
parentStable on amd64 wrt bug #320277 (diff)
downloadgentoo-2-08eba31266c992745dec890ef7ccec16697bd86b.tar.gz
gentoo-2-08eba31266c992745dec890ef7ccec16697bd86b.tar.bz2
gentoo-2-08eba31266c992745dec890ef7ccec16697bd86b.zip
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/httpup')
-rw-r--r--dev-util/httpup/ChangeLog8
-rw-r--r--dev-util/httpup/files/httpup-0.3.2-darwin.patch13
-rw-r--r--dev-util/httpup/files/httpup-0.3.2-gcc43.patch51
-rw-r--r--dev-util/httpup/files/httpup-0.3.2-gcc44.patch30
-rw-r--r--dev-util/httpup/files/httpup-0.4.0k-Makefile.patch26
-rw-r--r--dev-util/httpup/httpup-0.3.2.ebuild38
-rw-r--r--dev-util/httpup/httpup-0.4.0k.ebuild31
7 files changed, 64 insertions, 133 deletions
diff --git a/dev-util/httpup/ChangeLog b/dev-util/httpup/ChangeLog
index 7bd8aa750370..23834aa77552 100644
--- a/dev-util/httpup/ChangeLog
+++ b/dev-util/httpup/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/httpup
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/ChangeLog,v 1.8 2010/04/07 11:38:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/ChangeLog,v 1.9 2010/05/21 20:41:47 ssuominen Exp $
+
+*httpup-0.4.0k (21 May 2010)
+
+ 21 May 2010; Samuli Suominen <ssuominen@gentoo.org> +httpup-0.4.0k.ebuild,
+ +files/httpup-0.4.0k-Makefile.patch:
+ Version bump.
07 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
files/httpup-0.3.2-gcc43.patch:
diff --git a/dev-util/httpup/files/httpup-0.3.2-darwin.patch b/dev-util/httpup/files/httpup-0.3.2-darwin.patch
deleted file mode 100644
index 30a76c5fa8c3..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-* Darwin and BSD need libgen.h for basename, on linux this header is
- also available
-
---- httpup.cpp
-+++ httpup.cpp
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
-+#include <libgen.h>
-
- #include "fileutils.h"
- #include "httpup.h"
diff --git a/dev-util/httpup/files/httpup-0.3.2-gcc43.patch b/dev-util/httpup/files/httpup-0.3.2-gcc43.patch
deleted file mode 100644
index 5df79cb0c425..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -NrU5 httpup-0.3.2.orig/configparser.cpp httpup-0.3.2/configparser.cpp
---- httpup-0.3.2.orig/configparser.cpp 2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/configparser.cpp 2008-06-20 16:00:07.000000000 +0200
-@@ -8,10 +8,11 @@
- // the Free Software Foundation; either version 2 of the License, or
- // (at your option) any later version.
- ////////////////////////////////////////////////////////////////////////
-
- #include <iostream>
-+#include <cstring>
- #include "configparser.h"
-
- using namespace std;
-
- int ConfigParser::parseConfig(const std::string& fileName,
-diff -NrU5 httpup-0.3.2.orig/httpup.cpp httpup-0.3.2/httpup.cpp
---- httpup-0.3.2.orig/httpup.cpp 2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/httpup.cpp 2008-06-20 15:59:43.000000000 +0200
-@@ -13,11 +13,13 @@
-
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
- #include <libgen.h>
-+#include <cstring>
-+#include <cstdlib>
-
- #include "fileutils.h"
- #include "httpup.h"
- #include "configparser.h"
-
-diff -NrU5 httpup-0.3.2.orig/main.cpp httpup-0.3.2/main.cpp
---- httpup-0.3.2.orig/main.cpp 2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/main.cpp 2008-06-20 15:59:43.000000000 +0200
-@@ -8,11 +8,14 @@
- // the Free Software Foundation; either version 2 of the License, or
- // (at your option) any later version.
- ////////////////////////////////////////////////////////////////////////
-
- #include <iostream>
--#include <string>
-+#include <cstring>
-+#include <cstdlib>
-+#include <algorithm>
-+
- using namespace std;
-
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
diff --git a/dev-util/httpup/files/httpup-0.3.2-gcc44.patch b/dev-util/httpup/files/httpup-0.3.2-gcc44.patch
deleted file mode 100644
index 83f100c76589..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NrU5 httpup-0.3.2.original/configparser.cpp httpup-0.3.2/configparser.cpp
---- httpup-0.3.2.original/configparser.cpp 2009-08-25 20:01:59.000000000 -0600
-+++ httpup-0.3.2/configparser.cpp 2009-08-25 20:02:20.000000000 -0600
-@@ -9,10 +9,11 @@
- // (at your option) any later version.
- ////////////////////////////////////////////////////////////////////////
-
- #include <iostream>
- #include <cstring>
-+#include <cstdio>
- #include "configparser.h"
-
- using namespace std;
-
- int ConfigParser::parseConfig(const std::string& fileName,
-diff -NrU5 httpup-0.3.2.original/fileutils.cpp httpup-0.3.2/fileutils.cpp
---- httpup-0.3.2.original/fileutils.cpp 2009-08-25 20:01:59.000000000 -0600
-+++ httpup-0.3.2/fileutils.cpp 2009-08-25 20:02:29.000000000 -0600
-@@ -8,10 +8,11 @@
- // the Free Software Foundation; either version 2 of the License, or
- // (at your option) any later version.
- ////////////////////////////////////////////////////////////////////////
-
- #include <sys/types.h>
-+#include <cstdio>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
-
- #include "md5.h"
diff --git a/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
new file mode 100644
index 000000000000..ee4ed9dec288
--- /dev/null
+++ b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
@@ -0,0 +1,26 @@
+--- Makefile.orig 2010-05-21 23:31:01.000000000 +0300
++++ Makefile 2010-05-21 23:32:04.000000000 +0300
+@@ -8,10 +8,10 @@
+ mandir= $(prefix)/man
+
+
+-CXX= g++
+-CXXFLAGS= -O2 -pipe -DMF_VERSION=\"${version}\"
+-CXXFLAGS+= -g -Wall -Werror
+-LDFLAGS= -lcurl
++CXX?= g++
++CXXFLAGS+= -DMF_VERSION=\"${version}\"
++CXXFLAGS+= -Wall
++LIBS= -lcurl
+
+ INSTALL= /usr/bin/install
+ STRIP= /usr/bin/strip
+@@ -36,7 +36,7 @@
+
+
+ $(name): $(OBJS)
+- $(CXX) $(LDFLAGS) $(OBJS) -o $(name)
++ $(CXX) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS)
+
+ distclean: clean
+ -rm -f Makefile config.log config.h *~ *.core core.*
diff --git a/dev-util/httpup/httpup-0.3.2.ebuild b/dev-util/httpup/httpup-0.3.2.ebuild
deleted file mode 100644
index bf064bcadd9d..000000000000
--- a/dev-util/httpup/httpup-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/httpup-0.3.2.ebuild,v 1.5 2010/02/21 01:29:43 abcd Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="synchronisation tool for http file repositories"
-HOMEPAGE="http://clc.berlios.de/projects/httpup/"
-SRC_URI="http://jw.tks6.net/files/crux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-darwin.patch
- sed -i \
- -e 's:g++:$(CXX) $(CFLAGS) $(LDFLAGS):' \
- Makefile
- epatch "${FILESDIR}"/${P}-gcc43.patch
- epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" || die "make failed"
-}
-
-src_install() {
- dobin httpup httpup-repgen httpup-repgen2 || die "dobin"
- doman *.8
- dodoc AUTHORS README TODO ChangeLog httpup.conf.example
-}
diff --git a/dev-util/httpup/httpup-0.4.0k.ebuild b/dev-util/httpup/httpup-0.4.0k.ebuild
new file mode 100644
index 000000000000..85414a31de7d
--- /dev/null
+++ b/dev-util/httpup/httpup-0.4.0k.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/httpup-0.4.0k.ebuild,v 1.1 2010/05/21 20:41:47 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="synchronisation tool for http file repositories"
+HOMEPAGE="http://jw.tks6.net/files/crux/httpup_manual.html"
+SRC_URI="http://jw.tks6.net/files/crux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="net-misc/curl"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+ tc-export CC CXX
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" mandir="/usr/share/man" prefix="/usr" install || die
+ dodoc AUTHORS ChangeLog httpup.conf.example README TODO
+}