From 7c69c8c5d6ae62f7113783f0f917a9241efa2ed7 Mon Sep 17 00:00:00 2001
From: sketch <sketch@pkgsrc.org>
Date: Wed, 3 Dec 2003 17:31:04 +0000
Subject: Portability fixes to get the package to compile and install correctly
 under Solaris, maybe others too.

---
 archivers/lbrate/distinfo         |  5 +++--
 archivers/lbrate/patches/patch-aa | 15 +++++++--------
 archivers/lbrate/patches/patch-ab | 13 +++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 archivers/lbrate/patches/patch-ab

(limited to 'archivers')

diff --git a/archivers/lbrate/distinfo b/archivers/lbrate/distinfo
index d46ffeaafba..7033543aa30 100644
--- a/archivers/lbrate/distinfo
+++ b/archivers/lbrate/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/13 17:50:50 cjep Exp $
+$NetBSD: distinfo,v 1.2 2003/12/03 17:31:04 sketch Exp $
 
 SHA1 (lbrate-1.1.tar.gz) = 8731283e79fa6c7a73ebd6c821b42854cb864ea9
 Size (lbrate-1.1.tar.gz) = 29907 bytes
-SHA1 (patch-aa) = ad34e92fefc99c16fe067810d3ed6c160557e0ae
+SHA1 (patch-aa) = 30682a2304873ece8dca6ed8aa1f7a3b74fe0b44
+SHA1 (patch-ab) = 94127154f052908a99fb7a6a218984637850b93d
diff --git a/archivers/lbrate/patches/patch-aa b/archivers/lbrate/patches/patch-aa
index fc93abab930..d17011aec52 100644
--- a/archivers/lbrate/patches/patch-aa
+++ b/archivers/lbrate/patches/patch-aa
@@ -1,23 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/13 17:50:50 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/03 17:31:04 sketch Exp $
 
 --- Makefile.orig	Thu Aug 30 17:03:17 2001
-+++ Makefile
-@@ -1,7 +1,8 @@
++++ Makefile	Wed Dec  3 15:29:20 2003
+@@ -1,7 +1,7 @@
  # Makefile - makefile for lbrate
  
  CC=gcc
 -CFLAGS=-O2 -Wall
 +#CFLAGS=-O2 -Wall
-+CFLAGS+=-Wall
  
  # Set BINDIR to directory for binary,
  # MANDIR to directory for man page.
-@@ -19,14 +20,14 @@ OBJ=main.o readrle.o readhuff.o readlzw.
+@@ -19,14 +19,14 @@
  all: lbrate
  
  lbrate: $(OBJ)
 -	$(CC) $(CFLAGS) -o lbrate $(OBJ)
-+	$(CC) $(CFLAGS) -o lbrate $(OBJ) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib
++	$(CC) $(CFLAGS) -o lbrate $(OBJ) $(LDFLAGS)
  
  installdirs:
  	/bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
@@ -25,8 +24,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/13 17:50:50 cjep Exp $
  install: lbrate installdirs
 -	install -m 755 lbrate $(BINDIR)
 -	install -m 644 lbrate.1 $(MANDIR)
-+	install -c -m 755 lbrate $(BINDIR)
-+	install -c -m 644 lbrate.1 $(MANDIR)
++	$(BSD_INSTALL_PROGRAM) lbrate $(BINDIR)
++	$(BSD_INSTALL_MAN) lbrate.1 $(MANDIR)
  
  uninstall:
  	$(RM) $(BINDIR)/lbrate $(MANDIR)/lbrate.1
diff --git a/archivers/lbrate/patches/patch-ab b/archivers/lbrate/patches/patch-ab
new file mode 100644
index 00000000000..d39e27da856
--- /dev/null
+++ b/archivers/lbrate/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/12/03 17:31:04 sketch Exp $
+
+--- main.c.orig	Wed Dec  3 15:29:45 2003
++++ main.c	Wed Dec  3 15:30:22 2003
+@@ -29,7 +29,7 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <utime.h>
+-#include <getopt.h>
++#include <unistd.h>
+ 
+ #include "readrle.h"
+ #include "readhuff.h"
-- 
cgit v1.2.3