From 0d2d494721a0675a0e6d34deb93e44c1e0a23422 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 29 Jan 2010 16:38:20 +0000 Subject: DESTDIR support --- converters/cn2jp/Makefile | 13 +++++++------ converters/cn2jp/distinfo | 4 ++-- converters/cn2jp/patches/patch-aa | 6 +++--- converters/ish/Makefile | 5 ++++- converters/ish/distinfo | 4 ++-- converters/ish/patches/patch-aa | 4 ++-- converters/odt2txt/Makefile | 8 +++++--- converters/odt2txt/distinfo | 4 ++-- converters/odt2txt/patches/patch-aa | 32 +++++++++++++++++++++----------- 9 files changed, 48 insertions(+), 32 deletions(-) (limited to 'converters') diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile index 6778e2a6aba..c713cc38c6e 100644 --- a/converters/cn2jp/Makefile +++ b/converters/cn2jp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:12 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2010/01/29 16:43:34 joerg Exp $ DISTNAME= cn2jp1.4b PKGNAME= cn2jp-1.4b @@ -11,6 +11,7 @@ MAINTAINER= rxg@NetBSD.org # HOMEPAGE= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/ COMMENT= Library for code translation between Chinese and Japanese +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/cn2jp @@ -18,12 +19,12 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake NO_CONFIGURE= yes -AUTO_MKDIRS= yes + +INSTALLATION_DIRS+= bin include lib share/doc/cn2jp post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cn2jp - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cn2jp - ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cn2jp + ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${DESTDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${DESTDIR}${PREFIX}/include .include "../../mk/bsd.pkg.mk" diff --git a/converters/cn2jp/distinfo b/converters/cn2jp/distinfo index ef93fe32d93..31830ff90c0 100644 --- a/converters/cn2jp/distinfo +++ b/converters/cn2jp/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/06/21 15:00:51 minskim Exp $ +$NetBSD: distinfo,v 1.5 2010/01/29 16:43:34 joerg Exp $ SHA1 (cn2jp1.4b.tar.gz) = 09cee0b189e5925a5378f1f817cc9593be899518 RMD160 (cn2jp1.4b.tar.gz) = 7697648e23586a0fba0d840ba57cf816c175ac10 Size (cn2jp1.4b.tar.gz) = 271660 bytes -SHA1 (patch-aa) = a1b67afbc36161b2731a938d81e19af2c9fba7dd +SHA1 (patch-aa) = cf112ba4083a1a7e3520c683435da78629340961 SHA1 (patch-ab) = a5a43c0dd84515a5c8b7d0cacc9a49b9b378a8e1 SHA1 (patch-ac) = b601a2893b8a94374e4b4271be49f87ee244ae53 SHA1 (patch-ad) = 4c568df93470c404f12e4221fbb64c532ff18c6b diff --git a/converters/cn2jp/patches/patch-aa b/converters/cn2jp/patches/patch-aa index 2381db352ba..14f7cf8ddb2 100644 --- a/converters/cn2jp/patches/patch-aa +++ b/converters/cn2jp/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $ +$NetBSD: patch-aa,v 1.2 2010/01/29 16:43:34 joerg Exp $ --- Makefile.orig Tue Feb 27 22:35:44 1996 +++ Makefile @@ -26,9 +26,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $ +LIB = libcn2jp.a + +install: -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) ${DESTDIR}$(PREFIX)/lib + for i in $(PROG);do \ -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i $(PREFIX)/bin; \ ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i ${DESTDIR}$(PREFIX)/bin; \ + done + +all: clean mktable $(LIB) makeall diff --git a/converters/ish/Makefile b/converters/ish/Makefile index ddb3bea61d0..9e88feeefa3 100644 --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/09/09 02:41:55 obache Exp $ +# $NetBSD: Makefile,v 1.13 2010/01/29 16:47:53 joerg Exp $ DISTNAME= ish-1.11 CATEGORIES= converters @@ -7,6 +7,9 @@ MASTER_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Binary-to-text file-encoder +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS= bin MAKE_FILE= makefile BUILD_TARGET= ish diff --git a/converters/ish/distinfo b/converters/ish/distinfo index 65c69197cac..0398d583f68 100644 --- a/converters/ish/distinfo +++ b/converters/ish/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/12/19 00:06:47 joerg Exp $ +$NetBSD: distinfo,v 1.7 2010/01/29 16:47:53 joerg Exp $ SHA1 (ish-1.11.tar.gz) = 99c182c685210179428d44cf1a80d96766cf3d3e RMD160 (ish-1.11.tar.gz) = b3fd67f9ff579a865c269f0ba6db77060030fc97 Size (ish-1.11.tar.gz) = 13029 bytes -SHA1 (patch-aa) = 51dc6991eaa9b46c71a5c9f9b4e7cb862423d50d +SHA1 (patch-aa) = 10eccddc3167bdd3f3e1080f3a648065e0394242 SHA1 (patch-ab) = 64aec8b548fccd4ba5295cbd683cbff0304ae329 SHA1 (patch-ac) = acdbba64306ba01f37cd1d8c601e146e520a1cdf diff --git a/converters/ish/patches/patch-aa b/converters/ish/patches/patch-aa index 599a9899691..a39cc513f60 100644 --- a/converters/ish/patches/patch-aa +++ b/converters/ish/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1 2001/08/20 02:50:56 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:53 joerg Exp $ --- makefile.orig Sun Aug 5 07:04:08 1990 +++ makefile @@ -1,7 +1,7 @@ -DEST = . -+DEST = ${PREFIX}/bin ++DEST = ${DESTDIR}${PREFIX}/bin #CFLAGS = -O -DSysV -CFLAGS = -O -LDFLAGS = -s diff --git a/converters/odt2txt/Makefile b/converters/odt2txt/Makefile index 1a1dc4cb0ed..1164e53edf6 100644 --- a/converters/odt2txt/Makefile +++ b/converters/odt2txt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ +# $NetBSD: Makefile,v 1.2 2010/01/29 16:47:52 joerg Exp $ # DISTNAME= odt2txt-0.3 @@ -9,12 +9,14 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://stosberg.net/odt2txt/ COMMENT= Simple converter from OpenDocument Text to plain text +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake -MAKE_ENV+= DESTDIR="${LOCALBASE}" MANDIR="/${PKGMANDIR}" + +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -# TODO: maybe -m 644 for install of man page # TODO: iconv or not? # TODO: maybe package odf2html, odfread, odfreader diff --git a/converters/odt2txt/distinfo b/converters/odt2txt/distinfo index 41507fbeee9..e2a93b6c283 100644 --- a/converters/odt2txt/distinfo +++ b/converters/odt2txt/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ +$NetBSD: distinfo,v 1.2 2010/01/29 16:47:52 joerg Exp $ SHA1 (odt2txt-0.3.tar.gz) = efebf01e77a2bfa44ce7f4f24fc244889c480d77 RMD160 (odt2txt-0.3.tar.gz) = 0648959ab64018c0376045e8ae6d284d804cff9c Size (odt2txt-0.3.tar.gz) = 28810 bytes -SHA1 (patch-aa) = fb517f02b831c27bdab1a0bfad4bb1013299f32c +SHA1 (patch-aa) = 26bae43601f8e06936ac39d7fb1c599a2c094ca8 diff --git a/converters/odt2txt/patches/patch-aa b/converters/odt2txt/patches/patch-aa index 125ce16692c..5da42768eb5 100644 --- a/converters/odt2txt/patches/patch-aa +++ b/converters/odt2txt/patches/patch-aa @@ -1,19 +1,29 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $ +$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:52 joerg Exp $ ---- Makefile.orig 2007-05-21 15:50:37.000000000 -0500 -+++ Makefile 2008-04-14 15:30:47.000000000 -0500 -@@ -19,10 +19,14 @@ +--- Makefile.orig 2007-05-21 20:50:37.000000000 +0000 ++++ Makefile +@@ -19,10 +19,8 @@ ALL_OBJ = $(OBJ) $(TEST_OBJ) INSTALL = install GROFF = groff -+ifndef DESTDIR - DESTDIR = /usr/local -+endif - PREFIX = +-DESTDIR = /usr/local +-PREFIX = BINDIR = $(PREFIX)/bin -+ifndef MANDIR - MANDIR = $(PREFIX)/share/man -+endif +-MANDIR = $(PREFIX)/share/man ++MANDIR = $(PREFIX)/${PKGMANDIR}/man MAN1DIR = $(MANDIR)/man1 ifeq ($(UNAME_S),FreeBSD) +@@ -79,10 +77,8 @@ $(ALL_OBJ): Makefile + all: $(BIN) + + install: $(BIN) $(MAN) +- $(INSTALL) -d -m755 $(DESTDIR)$(BINDIR) +- $(INSTALL) $(BIN) $(DESTDIR)$(BINDIR) +- $(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR) +- $(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR) ++ $(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MAN1DIR) + + odt2txt.html: $(MAN) + $(GROFF) -Thtml -man $(MAN) > $@ -- cgit v1.2.3