From 3d170be9d708490b709bc01a616816ec2a577a25 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 7 Aug 2002 18:17:49 +0000 Subject: [PATCH] simplify --- misc/hfsplus/Makefile | 6 ++++-- misc/hfsplus/patches/patch-libhfsp_src_Makefile_am | 11 ----------- misc/hfsplus/patches/patch-src_Makefile_am | 12 ------------ 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 misc/hfsplus/patches/patch-libhfsp_src_Makefile_am delete mode 100644 misc/hfsplus/patches/patch-src_Makefile_am diff --git a/misc/hfsplus/Makefile b/misc/hfsplus/Makefile index f31e8aa2663..6c27f0cdf86 100644 --- a/misc/hfsplus/Makefile +++ b/misc/hfsplus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/31 02:26:04 drahn Exp $ +# $OpenBSD: Makefile,v 1.4 2002/08/07 18:17:49 brad Exp $ COMMENT= "hfsplus filesystem access tool" @@ -9,7 +9,6 @@ PKGNAME= hfsplus-1.0.2 DISTNAME= hfsplus_1.0.2.orig WRKDIST= ${WRKDIR}/hfsplus CATEGORIES= misc -NEED_VERSION= 1.402 PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -29,6 +28,9 @@ MASTER_SITES= http://ftp.penguinppc.org/projects/hfsplus/ # actually uses automake/autoheader, but that is done in pre-configure now CONFIGURE_STYLE= gnu +CONFIGURE_ENV= LIBS="-lutf8" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} pre-configure: diff --git a/misc/hfsplus/patches/patch-libhfsp_src_Makefile_am b/misc/hfsplus/patches/patch-libhfsp_src_Makefile_am deleted file mode 100644 index 6299ad15185..00000000000 --- a/misc/hfsplus/patches/patch-libhfsp_src_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libhfsp_src_Makefile_am,v 1.1.1.1 2002/03/30 20:46:26 drahn Exp $ ---- libhfsp/src/Makefile.am.orig Tue Oct 17 00:58:46 2000 -+++ libhfsp/src/Makefile.am Mon Mar 25 21:12:58 2002 -@@ -28,6 +28,7 @@ libhfsp_la_SOURCES = \ - record.c volume.c - - CFLAGS = -O2 -Wall -+INCLUDES = -I/usr/local/include - - # I need to clean up this header first becore i can distribute them ... - # include_HEADERS = apple.h hfs.h hfsp.h libhfsp.h diff --git a/misc/hfsplus/patches/patch-src_Makefile_am b/misc/hfsplus/patches/patch-src_Makefile_am deleted file mode 100644 index 74a16b001f4..00000000000 --- a/misc/hfsplus/patches/patch-src_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Makefile_am,v 1.1.1.1 2002/03/30 20:46:26 drahn Exp $ ---- src/Makefile.am.orig Wed Oct 25 06:40:58 2000 -+++ src/Makefile.am Mon Mar 25 21:06:06 2002 -@@ -27,7 +27,7 @@ hpcopy_SOURCES = hpcopy.c hpcache.c char - - hpfsck_SOURCES = hpfsck.c hfsputil.c glob.c dstring.c dlist.c - --LDADD = ../libhfsp/src/libhfsp.la -+LDADD = ../libhfsp/src/libhfsp.la -L/usr/local/lib -lutf8 - - # dynamically linked tools dont work, yet .. - # LDADD = ../libhfsp/src/libhfsp.la