Properly fix the "missing" header.

From Brad.
This commit is contained in:
shadchin 2011-05-31 02:33:21 +00:00
parent 6b21ae8f46
commit 65586efaf2
4 changed files with 6 additions and 52 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2011/05/30 16:53:40 shadchin Exp $
# $OpenBSD: Makefile,v 1.4 2011/05/31 02:33:21 shadchin Exp $
COMMENT= library for reading, creating and modifying zip archives
DISTNAME= libzip-0.10
REVISION= 0
REVISION= 1
CATEGORIES= archivers
SHARED_LIBS += zip 0.0 # 1.0

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/05/30 16:53:40 shadchin Exp $
--- lib/Makefile.in.orig Fri Mar 18 17:51:26 2011
+++ lib/Makefile.in Mon May 30 22:11:51 2011
@@ -240,7 +240,7 @@ top_srcdir = @top_srcdir@
libincludedir = ${libdir}/@PACKAGE@/include
lib_LTLIBRARIES = libzip.la
noinst_HEADERS = zipint.h
-include_HEADERS = zip.h
+include_HEADERS = zip.h zipconf.h
libinclude_HEADERS = zipconf.h
# also update CMakeLists.txt when changing version
@@ -629,7 +629,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(libincludedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -683,7 +683,7 @@ info: info-am
info-am:
-install-data-am: install-includeHEADERS install-libincludeHEADERS
+install-data-am: install-includeHEADERS
install-dvi: install-dvi-am

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-libzip_pc_in,v 1.1 2011/05/30 16:53:40 shadchin Exp $
--- libzip.pc.in.orig Mon May 30 21:53:48 2011
+++ libzip.pc.in Mon May 30 21:54:22 2011
@@ -2,7 +2,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-libincludedir=@libdir@/libzip/include
zipcmp=@prefix@/bin/zipcmp
@@ -10,5 +9,5 @@ Name: libzip
Description: library for handling zip archives
Version: @VERSION@
Libs: -L${libdir} -lzip @LIBS@
-Cflags: -I${includedir} -I${libincludedir}
+Cflags: -I${includedir}

View File

@ -1,12 +1,14 @@
@comment $OpenBSD: PLIST,v 1.2 2011/05/30 16:53:40 shadchin Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/05/31 02:33:21 shadchin Exp $
%%SHARED%%
@bin bin/zipcmp
@bin bin/zipmerge
@bin bin/ziptorrent
include/zip.h
include/zipconf.h
lib/libzip/
lib/libzip.a
lib/libzip.la
lib/libzip/include/
lib/libzip/include/zipconf.h
lib/pkgconfig/
lib/pkgconfig/libzip.pc
@man man/man1/zipcmp.1