From a6a84526c43e4bb9b39c6349c8e4c6b93a6861f0 Mon Sep 17 00:00:00 2001
From: zuntum <zuntum@pkgsrc.org>
Date: Sat, 5 Feb 2005 16:27:39 +0000
Subject: Fix PR#28775 by Georg Schwarz <georg.schwarz@freenet.de>: improve
 portability:

 - use "test -r" instead of "test -e"
 - use ${INSTALL_*}
---
 mail/oe2mbx/Makefile         | 12 +++++-------
 mail/oe2mbx/patches/patch-aa | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 mail/oe2mbx/patches/patch-aa

(limited to 'mail/oe2mbx')

diff --git a/mail/oe2mbx/Makefile b/mail/oe2mbx/Makefile
index 81804ff5605..110eb6e21b5 100644
--- a/mail/oe2mbx/Makefile
+++ b/mail/oe2mbx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/05 16:27:39 zuntum Exp $
 #
 
 DISTNAME=	oe2mbx-1.21
@@ -12,15 +12,13 @@ COMMENT=	Outlook Express messages to the Unix mailbox format converter
 WRKSRC=		${WRKDIR}/liboe-0.92
 MAKEFILE=	makefile
 
+MAKE_ENV+=      INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_LIB="${INSTALL_LIB}" \
+		INSTALL_DATA="${INSTALL_DATA}"
+
 BUILD_TARGET=	liboe oe2mbx
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} clean
 
-post-patch:
-	${SED}	-e "s,gcc,${CC} ${CFLAGS},g"				\
-		-e "s,^PREFIX,#PREFIX,g"				\
-		 ${WRKSRC}/${MAKEFILE} > ${WRKSRC}/${MAKEFILE}.done
-	${MV} ${WRKSRC}/${MAKEFILE}.done ${WRKSRC}/${MAKEFILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/oe2mbx/patches/patch-aa b/mail/oe2mbx/patches/patch-aa
new file mode 100644
index 00000000000..226a08eca3a
--- /dev/null
+++ b/mail/oe2mbx/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2005/02/05 16:27:39 zuntum Exp $
+
+--- makefile.orig	Sat Jun 17 17:30:36 2000
++++ makefile
+@@ -1,22 +1,22 @@
+ # MAKEFILE FOR LIBOE AND OE2MBX
+ # Read README for info
+ 
+-PREFIX = /usr
++PREFIX ?= /usr
+ LIBDIR = $(PREFIX)/lib
+ BINDIR = $(PREFIX)/bin
+ INCLUDEDIR = $(PREFIX)/include
+ 
+ oe2mbx : src/oe2mbx.c lib/liboe.o
+-	gcc src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
++	$(CC) $(CFLAGS) src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
+ dynamic : src/oe2mbx.c
+-	gcc src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
++	$(CC) $(CFLAGS) src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
+ liboe : src/liboe.c
+-	gcc -c src/liboe.c -o lib/liboe.so
++	$(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.so
+ lib/liboe.o : src/liboe.c
+-	gcc -c src/liboe.c -o lib/liboe.o	
++	$(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.o	
+ install : 
+-	test -e bin/* && install bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared
+-	test -e lib/*.so && install lib/*.so $(LIBDIR) && install src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared
++	test -r bin/* && ${INSTALL_PROGRAM} bin/* $(BINDIR) && echo oe2mbx binary installed || echo oe2mbx binary not prepared
++	test -r lib/*.so && ${INSTALL_LIB} lib/*.so $(LIBDIR) && ${INSTALL_DATA} src/*.h $(INCLUDEDIR) && echo liboe library installed || echo liboe library not prepared
+ clean	:
+-	test -e bin/* && rm -f bin/* || test .
+-	test -e lib/* && rm -f lib/* || test .
++	test -r bin/* && rm -f bin/* || test .
++	test -r lib/* && rm -f lib/* || test .
-- 
cgit v1.2.3