Fri Jan 29 16:47:52 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/odt2txt/Makefile 2008/04/17 12:33:56 1.1.1.1
+++ pkgsrc/converters/odt2txt/Makefile 2010/01/29 16:47:52 1.2
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ 1# $NetBSD: Makefile,v 1.2 2010/01/29 16:47:52 joerg Exp $
2# 2#
3 3
4DISTNAME= odt2txt-0.3 4DISTNAME= odt2txt-0.3
5CATEGORIES= converters textproc 5CATEGORIES= converters textproc
6MASTER_SITES= http://stosberg.net/odt2txt/ 6MASTER_SITES= http://stosberg.net/odt2txt/
7 7
8MAINTAINER= reed@reedmedia.net 8MAINTAINER= reed@reedmedia.net
9HOMEPAGE= http://stosberg.net/odt2txt/ 9HOMEPAGE= http://stosberg.net/odt2txt/
10COMMENT= Simple converter from OpenDocument Text to plain text 10COMMENT= Simple converter from OpenDocument Text to plain text
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12USE_TOOLS+= gmake 14USE_TOOLS+= gmake
13MAKE_ENV+= DESTDIR="${LOCALBASE}" MANDIR="/${PKGMANDIR}" 15
 16INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
14 17
15.include "../../converters/libiconv/buildlink3.mk" 18.include "../../converters/libiconv/buildlink3.mk"
16.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
17 20
18# TODO: maybe -m 644 for install of man page 
19# TODO: iconv or not? 21# TODO: iconv or not?
20# TODO: maybe package odf2html, odfread, odfreader 22# TODO: maybe package odf2html, odfread, odfreader
cvs diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/odt2txt/distinfo 2008/04/17 12:33:56 1.1.1.1
+++ pkgsrc/converters/odt2txt/distinfo 2010/01/29 16:47:52 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ 1$NetBSD: distinfo,v 1.2 2010/01/29 16:47:52 joerg Exp $
2 2
3SHA1 (odt2txt-0.3.tar.gz) = efebf01e77a2bfa44ce7f4f24fc244889c480d77 3SHA1 (odt2txt-0.3.tar.gz) = efebf01e77a2bfa44ce7f4f24fc244889c480d77
4RMD160 (odt2txt-0.3.tar.gz) = 0648959ab64018c0376045e8ae6d284d804cff9c 4RMD160 (odt2txt-0.3.tar.gz) = 0648959ab64018c0376045e8ae6d284d804cff9c
5Size (odt2txt-0.3.tar.gz) = 28810 bytes 5Size (odt2txt-0.3.tar.gz) = 28810 bytes
6SHA1 (patch-aa) = fb517f02b831c27bdab1a0bfad4bb1013299f32c 6SHA1 (patch-aa) = 26bae43601f8e06936ac39d7fb1c599a2c094ca8
cvs diff -r1.1.1.1 -r1.2 pkgsrc/converters/odt2txt/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/converters/odt2txt/patches/patch-aa 2008/04/17 12:33:56 1.1.1.1
+++ pkgsrc/converters/odt2txt/patches/patch-aa 2010/01/29 16:47:52 1.2
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ 1$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:52 joerg Exp $
2 2
3--- Makefile.orig 2007-05-21 15:50:37.000000000 -0500 3--- Makefile.orig 2007-05-21 20:50:37.000000000 +0000
4+++ Makefile 2008-04-14 15:30:47.000000000 -0500 4+++ Makefile
5@@ -19,10 +19,14 @@ 5@@ -19,10 +19,8 @@ ALL_OBJ = $(OBJ) $(TEST_OBJ)
6 INSTALL = install 6 INSTALL = install
7 GROFF = groff 7 GROFF = groff
8  8
9+ifndef DESTDIR 9-DESTDIR = /usr/local
10 DESTDIR = /usr/local 10-PREFIX =
11+endif 
12 PREFIX = 
13 BINDIR = $(PREFIX)/bin 11 BINDIR = $(PREFIX)/bin
14+ifndef MANDIR 12-MANDIR = $(PREFIX)/share/man
15 MANDIR = $(PREFIX)/share/man 13+MANDIR = $(PREFIX)/${PKGMANDIR}/man
16+endif 
17 MAN1DIR = $(MANDIR)/man1 14 MAN1DIR = $(MANDIR)/man1
18  15
19 ifeq ($(UNAME_S),FreeBSD) 16 ifeq ($(UNAME_S),FreeBSD)
 17@@ -79,10 +77,8 @@ $(ALL_OBJ): Makefile
 18 all: $(BIN)
 19
 20 install: $(BIN) $(MAN)
 21- $(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
 22- $(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
 23- $(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
 24- $(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
 25+ $(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
 26+ $(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MAN1DIR)
 27
 28 odt2txt.html: $(MAN)
 29 $(GROFF) -Thtml -man $(MAN) > $@