diff options
| author | sbd <sbd@pkgsrc.org> | 2012-01-29 08:26:32 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-01-29 08:26:32 +0000 |
| commit | 8c3a80ed239a0a0475cfce3ee5e9fba6f62d6354 (patch) | |
| tree | a035dbe92388b3915b3f7d09e1891d8d74cac0ab /archivers | |
| parent | 439d7f3a0f24730dfc429311a4fd7197950e5fe8 (diff) | |
| download | pkgsrc-8c3a80ed239a0a0475cfce3ee5e9fba6f62d6354.tar.gz | |
Clean up DESTDIR support so unprivileged pbulk works.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/lbrate/distinfo | 4 | ||||
| -rw-r--r-- | archivers/lbrate/patches/patch-aa | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/archivers/lbrate/distinfo b/archivers/lbrate/distinfo index b51c1f41476..0238b481764 100644 --- a/archivers/lbrate/distinfo +++ b/archivers/lbrate/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2009/02/09 23:25:45 joerg Exp $ +$NetBSD: distinfo,v 1.6 2012/01/29 08:26:32 sbd Exp $ SHA1 (lbrate-1.1.tar.gz) = 8731283e79fa6c7a73ebd6c821b42854cb864ea9 RMD160 (lbrate-1.1.tar.gz) = ccf0d889eb597d3beecceb40349ddbf00f0273c8 Size (lbrate-1.1.tar.gz) = 29907 bytes -SHA1 (patch-aa) = 0361401856f93717a45d8599450b5419574d1545 +SHA1 (patch-aa) = 2a20b1d56a266316ba4968a40f3bc6bed6deaead SHA1 (patch-ab) = 94127154f052908a99fb7a6a218984637850b93d diff --git a/archivers/lbrate/patches/patch-aa b/archivers/lbrate/patches/patch-aa index d84fa58da84..95b2c6ba9fd 100644 --- a/archivers/lbrate/patches/patch-aa +++ b/archivers/lbrate/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2009/02/09 23:25:45 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2012/01/29 08:26:32 sbd Exp $ ---- Makefile.orig Thu Aug 30 17:03:17 2001 -+++ Makefile Wed Dec 3 15:29:20 2003 +--- Makefile.orig 2001-08-30 16:03:17.000000000 +0000 ++++ Makefile @@ -1,7 +1,7 @@ # Makefile - makefile for lbrate @@ -11,7 +11,16 @@ $NetBSD: patch-aa,v 1.4 2009/02/09 23:25:45 joerg Exp $ # Set BINDIR to directory for binary, # MANDIR to directory for man page. -@@ -19,14 +19,14 @@ +@@ -9,7 +9,7 @@ CFLAGS=-O2 -Wall + # + PREFIX=/usr/local + BINDIR=$(PREFIX)/bin +-MANDIR=$(PREFIX)/man/man1 ++MANDIR=$(PREFIX)/$(PKGMANDIR)/man1 + + # You shouldn't need to edit below this line. + #-------------------------------------------------------- +@@ -19,14 +19,14 @@ OBJ=main.o readrle.o readhuff.o readlzw. all: lbrate lbrate: $(OBJ) @@ -19,13 +28,14 @@ $NetBSD: patch-aa,v 1.4 2009/02/09 23:25:45 joerg Exp $ + $(CC) $(CFLAGS) -o lbrate $(OBJ) $(LDFLAGS) installdirs: - /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) +- /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR) ++ /bin/sh ./mkinstalldirs ${DESTDIR}$(BINDIR) ${DESTDIR}$(MANDIR) install: lbrate installdirs - install -m 755 lbrate $(BINDIR) - install -m 644 lbrate.1 $(MANDIR) + $(BSD_INSTALL_PROGRAM) lbrate ${DESTDIR}$(BINDIR) -+ $(BSD_INSTALL_MAN) lbrate.1 ${DESTDIR}${PREFIX}/$(PKGMANDIR)/man1/ ++ $(BSD_INSTALL_MAN) lbrate.1 ${DESTDIR}$(MANDIR) uninstall: $(RM) $(BINDIR)/lbrate $(MANDIR)/lbrate.1 |