pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libhttpd: fix build



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sat Oct 24 19:04:27 2015 +0200
Changeset:	6cf6979cd88c597687bae9e20be3acf30ba14e84

Modified Files:
	libhttpd/Makefile
	libhttpd/distinfo
	libhttpd/patches/patch-ab

Log Message:
libhttpd: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6cf6979cd88c597687bae9e20be3acf30ba14e84

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

diffstat:
 libhttpd/Makefile         | 5 +++--
 libhttpd/distinfo         | 2 +-
 libhttpd/patches/patch-ab | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs:
diff --git a/libhttpd/Makefile b/libhttpd/Makefile
index 05d7c9d..8a6da3e 100644
--- a/libhttpd/Makefile
+++ b/libhttpd/Makefile
@@ -9,9 +9,10 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.hughes.com.au/products/libhttpd/
 COMMENT=		Library that provides basic web server capabilities
 
-PKG_DESTDIR_SUPPORT=	none
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_TOOLS=		gmake
+
+INSTALLATION_DIRS=	include lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libhttpd/distinfo b/libhttpd/distinfo
index bfa75a6..cbba1cb 100644
--- a/libhttpd/distinfo
+++ b/libhttpd/distinfo
@@ -4,4 +4,4 @@ SHA1 (libhttpd-1.4.tar.gz) = 7ab3d829a6e3fad8fdda47db98c8392e1d2cc80e
 RMD160 (libhttpd-1.4.tar.gz) = 04ab4bae4788c748a1bddc5f9676895d5d27751b
 Size (libhttpd-1.4.tar.gz) = 169015 bytes
 SHA1 (patch-aa) = 74a30b14262949aa6e717522ebe719c1a33ca6c2
-SHA1 (patch-ab) = a65f4fee268735f460de3846f920ffe6b12a0d88
+SHA1 (patch-ab) = a3c76197bb6e0940a747c29a6f7fbf88894254f4
diff --git a/libhttpd/patches/patch-ab b/libhttpd/patches/patch-ab
index 0550668..66a9f56 100644
--- a/libhttpd/patches/patch-ab
+++ b/libhttpd/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2005/02/06 00:30:43 mreriksson Exp $
+$NetBSD$
 
---- src/Makefile.tmpl.orig	2005-02-06 00:59:19.000000000 +0100
+--- src/Makefile.tmpl.orig	2004-05-09 18:06:24.000000000 +0000
 +++ src/Makefile.tmpl
 @@ -1,3 +1,3 @@
  !library_unix libhttpd.a protocol.c,api.c,version.c,ip_acl.c,ember.c
 -!libinstall libhttpd.a /usr/local/lib/libhttpd.a 744 $(ROOT)
 -!install httpd.h /usr/local/include/httpd.h 744 $(ROOT)
-+!libinstall libhttpd.a ${PREFIX}/lib/libhttpd.a 744 $(ROOT)
-+!install httpd.h ${PREFIX}/include/httpd.h 744 $(ROOT)
++!libinstall libhttpd.a ${DESTDIR}${PREFIX}/lib/libhttpd.a 644 $(ROOT)
++!install httpd.h ${DESTDIR}${PREFIX}/include/httpd.h 644 $(ROOT)


Home | Main Index | Thread Index | Old Index