simplify

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:

misc/hfsplus/patches/patch-libhfsp_src_Makefile_am

@@ -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 

misc/hfsplus/patches/patch-src_Makefile_am

@@ -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