PKGREVISION++

- remove dependency on GNU make
- this package doesn't really use buildlink2
- pass CFLAGS

3 files changed, 38 insertions, 6 deletions

diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index d4bf9f1c31f..23a6535827b 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/05/08 09:55:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/11 12:37:33 salo Exp $
+#
 
 DISTNAME=	unrarsrc-3.2.1
 PKGNAME=	${DISTNAME:S/src//}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/unrar
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
@@ -17,13 +19,10 @@ RESTRICTED=	"Do not modify. Do not charge a fee for redistribution."
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-USE_BUILDLINK2=	# defined
-USE_GMAKE=	# defined
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unrar
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} unrar ${PREFIX}/bin
-	cd ${WRKSRC} && ${INSTALL_MAN} readme.txt license.txt \
+	cd ${WRKSRC} && ${INSTALL_DATA} readme.txt license.txt	\
 		${PREFIX}/share/doc/unrar
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index aaf3a7e4a0a..1b9fccae7f1 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.8 2003/05/08 09:55:31 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/05/11 12:37:33 salo Exp $
 
 SHA1 (unrarsrc-3.2.1.tar.gz) = 8d5fc4791dd777b90e9ddf7616b352751614b144
 Size (unrarsrc-3.2.1.tar.gz) = 114867 bytes
+SHA1 (patch-aa) = 9f0a975aa9d3ddfe0d85dfe96dde989032747390
diff --git a/archivers/unrar/patches/patch-aa b/archivers/unrar/patches/patch-aa
new file mode 100644
index 00000000000..6a0ca0eba9a
--- /dev/null
+++ b/archivers/unrar/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.7 2003/05/11 12:37:33 salo Exp $
+
+--- makefile.unix.orig	2003-01-03 19:14:22.000000000 +0100
++++ makefile.unix	2003-05-11 14:22:31.000000000 +0200
+@@ -6,8 +6,8 @@
+ #
+ 
+ # Linux using GCC
+-CXX=g++
+-CXXFLAGS=-O2
++#CXX=g++
++CXXFLAGS+=-O2
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ 
+ # Linux using LCC
+@@ -41,6 +41,8 @@
+ COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
+ LINK=$(CXX)
+ 
++WHAT=UNRAR
++
+ UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
+ 
+ OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
+@@ -56,7 +58,6 @@
+ clean:
+ 	@rm -f *.o *.bak *~
+ 
+-unrar:	WHAT=UNRAR
+ unrar:	$(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f makeunrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)