summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-08-12 10:30:58 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-08-12 10:30:58 +0200
commit8ad8223f780260891e38bdc54edc6b401f8f6a6e (patch)
treee8e17989456499ab1d39f5778ecffbf27957a42b /package
parent8f16335443a322578274737c8d80ce557e4d2656 (diff)
parent36a26b341d49d90e5b936278478134aa178a0238 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/mksh/Makefile4
-rw-r--r--package/polipo/patches/patch-Makefile23
2 files changed, 24 insertions, 3 deletions
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index b3c1f17e0..c6f6d4541 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mksh
-PKG_VERSION:= 45
+PKG_VERSION:= 47
PKG_RELEASE:= 1
-PKG_MD5SUM:= d3d90973119ae689d5300b690600e1dc
+PKG_MD5SUM:= 71c7cbcd78306897801b8b6691091e66
PKG_DESCR:= MirBSD Korn Shell
PKG_SECTION:= shells
PKG_URL:= http://www.mirbsd.org/
diff --git a/package/polipo/patches/patch-Makefile b/package/polipo/patches/patch-Makefile
index 6aa6677d0..9c5d45ef8 100644
--- a/package/polipo/patches/patch-Makefile
+++ b/package/polipo/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- polipo-1.0.4.1.orig/Makefile 2010-02-01 00:13:20.000000000 +0100
-+++ polipo-1.0.4.1/Makefile 2013-07-22 18:06:28.000000000 +0200
++++ polipo-1.0.4.1/Makefile 2013-08-10 14:50:56.263961243 +0200
@@ -63,7 +63,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_RO
DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
@@ -9,3 +9,24 @@
SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
config.c local.c http.c client.c server.c auth.c tunnel.c \
+@@ -84,9 +84,9 @@ md5import.o: md5import.c md5.c
+
+ .PHONY: all install install.binary install.man
+
+-all: polipo$(EXE) polipo.info html/index.html localindex.html
++all: polipo$(EXE)
+
+-install: install.binary install.man
++install: install.binary
+
+ install.binary: all
+ mkdir -p $(TARGET)$(BINDIR)
+@@ -94,8 +94,6 @@ install.binary: all
+ mkdir -p $(TARGET)$(LOCAL_ROOT)/doc
+ rm -f $(TARGET)$(BINDIR)/polipo
+ cp -f polipo $(TARGET)$(BINDIR)/
+- cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc
+- cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
+
+ install.man: all
+ mkdir -p $(TARGET)$(MANDIR)/man1