- respect CFLAGS

- regen patches while here
This commit is contained in:
ajacoutot 2007-11-21 14:30:35 +00:00
parent 9967a51df8
commit 36e24e4cbd
5 changed files with 35 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2007/09/15 23:54:17 merdely Exp $
# $OpenBSD: Makefile,v 1.15 2007/11/21 14:30:35 ajacoutot Exp $
COMMENT= hfsplus filesystem access tool
@ -7,7 +7,7 @@ ONLY_FOR_ARCHS= powerpc
VERSION= 1.0.4
DISTNAME= hfsplus_${VERSION}
PKGNAME= hfsplus-${VERSION}p1
PKGNAME= hfsplus-${VERSION}p2
WRKDIST= ${WRKDIR}/hfsplus-${VERSION}
CATEGORIES= misc
EXTRACT_SUFX= .src.tar.bz2
@ -17,7 +17,8 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
WANTLIB= c
AUTOCONF_VERSION= 2.59
BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}*:devel/autoconf/${AUTOCONF_VERSION}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-libhfsp_src_Makefile_am,v 1.3 2007/11/21 14:30:35 ajacoutot Exp $
--- libhfsp/src/Makefile.am.orig Wed Nov 21 13:58:18 2007
+++ libhfsp/src/Makefile.am Wed Nov 21 13:58:44 2007
@@ -27,7 +27,5 @@ libhfsp_la_SOURCES = \
blockiter.c btree.c btreecheck.c fscheck.c hfstime.c libhfsp.c os.c unicode.c \
record.c volume.c partitions.c
-CFLAGS = -O2 -Wall
-
# I need to clean up these headers first before i can distribute them ...
# include_HEADERS = apple.h hfs.h hfsp.h libhfsp.h

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-libhfsp_src_swab_h,v 1.2 2003/01/05 01:59:34 brad Exp $
--- libhfsp/src/swab.h.orig Tue Mar 5 14:50:29 2002
+++ libhfsp/src/swab.h Fri Jan 3 14:27:53 2003
$OpenBSD: patch-libhfsp_src_swab_h,v 1.3 2007/11/21 14:30:36 ajacoutot Exp $
--- libhfsp/src/swab.h.orig Tue Mar 5 20:50:29 2002
+++ libhfsp/src/swab.h Wed Nov 21 13:55:02 2007
@@ -24,8 +24,13 @@
* $Id: patch-libhfsp_src_swab_h,v 1.2 2003/01/05 01:59:34 brad Exp $
* $Id: patch-libhfsp_src_swab_h,v 1.3 2007/11/21 14:30:36 ajacoutot Exp $
*/
+#if defined(__OpenBSD__)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_am,v 1.3 2007/11/21 14:30:36 ajacoutot Exp $
--- src/Makefile.am.orig Wed Nov 21 13:58:32 2007
+++ src/Makefile.am Wed Nov 21 13:59:01 2007
@@ -8,8 +8,6 @@
INCLUDES = -I../libhfsp/src
-CFLAGS = -O2 -Wall
-
bin_PROGRAMS = hpmount hpumount hpls hpcd hpcopy hppwd hpfsck hprm hpmkdir
hpmount_SOURCES = hpmount.c hpcache.c hfsputil.c glob.c dstring.c dlist.c

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_hpls_c,v 1.2 2003/01/05 01:59:34 brad Exp $
--- src/hpls.c.orig Sun Mar 17 12:20:39 2002
+++ src/hpls.c Fri Jan 3 14:27:54 2003
$OpenBSD: patch-src_hpls_c,v 1.3 2007/11/21 14:30:36 ajacoutot Exp $
--- src/hpls.c.orig Sun Mar 17 18:20:39 2002
+++ src/hpls.c Wed Nov 21 13:55:02 2007
@@ -417,7 +417,7 @@ void showmisc(record *ent, int flags)
{
size = ent->record.u.file.data_fork.total_size +
@ -10,7 +10,7 @@ $OpenBSD: patch-src_hpls_c,v 1.2 2003/01/05 01:59:34 brad Exp $
}
}
@@ -484,7 +484,7 @@ void show_long(int sz, queueent *ents, c
@@ -484,7 +484,7 @@ void show_long(int sz, queueent *ents, char **strs,
else if (ent->record.type == HFSP_FILE)
{
hfsp_cat_file* f = &ent->record.u.file;