From 1df431a5d3c7dfee81b2bdb8a9329fb0e19be600 Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 31 Aug 2007 21:48:37 +0000 Subject: Add DESTDIR support --- misc/qterm/Makefile | 4 +++- misc/qterm/distinfo | 4 ++-- misc/qterm/patches/patch-aa | 21 ++++++++++++--------- misc/utftools/Makefile | 5 +++-- misc/utftools/distinfo | 4 ++-- misc/utftools/patches/patch-ae | 16 +++++++++------- 6 files changed, 31 insertions(+), 23 deletions(-) (limited to 'misc') diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile index 3b45ca12e27..f59282912a7 100644 --- a/misc/qterm/Makefile +++ b/misc/qterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/08/31 21:50:50 agc Exp $ # DISTNAME= qterm-ac-1.0 @@ -15,6 +15,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +PKG_DESTDIR_SUPPORT= user-destdir + EGDIR= ${PREFIX}/share/examples/qterm CONF_FILES= ${EGDIR}/qtermtab ${PKG_SYSCONFDIR}/qtermtab diff --git a/misc/qterm/distinfo b/misc/qterm/distinfo index 22b1eb6a90f..32e1eeca441 100644 --- a/misc/qterm/distinfo +++ b/misc/qterm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/11/10 18:13:53 joerg Exp $ +$NetBSD: distinfo,v 1.6 2007/08/31 21:50:50 agc Exp $ SHA1 (qterm-ac-1.0.tar.gz) = 2603f57265f62b144418ff4a283fc3454f9dcb4c RMD160 (qterm-ac-1.0.tar.gz) = 6234e96caff468ba5dd13babb6a0b2e33dcbd3d4 Size (qterm-ac-1.0.tar.gz) = 42415 bytes -SHA1 (patch-aa) = f0bb49766ecd146788b4782da36c94423efe8fbb +SHA1 (patch-aa) = f4909ffb2d7729b264e796f6083a71f284d1884e SHA1 (patch-ab) = 49c741feed2bab08084fba6c9880a4e29e2db62c diff --git a/misc/qterm/patches/patch-aa b/misc/qterm/patches/patch-aa index 86eb1fc82f6..c5838b2a01e 100644 --- a/misc/qterm/patches/patch-aa +++ b/misc/qterm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2002/12/22 22:26:54 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2007/08/31 21:50:50 agc Exp $ ---- Makefile.in.orig Fri Apr 11 15:13:32 1997 -+++ Makefile.in -@@ -22,7 +22,8 @@ prefix=@prefix@ +--- Makefile.in.orig 1997-04-11 14:13:32.000000000 +0100 ++++ Makefile.in 2007-08-31 12:44:39.000000000 +0100 +@@ -22,7 +22,8 @@ exec_prefix=@exec_prefix@ BINDIR=$(exec_prefix)/bin LIBDIR=$(exec_prefix)/lib @@ -12,15 +12,18 @@ $NetBSD: patch-aa,v 1.1 2002/12/22 22:26:54 jmmv Exp $ INCDIR=$(prefix)/include MANDIR=$(prefix)/man -@@ -53,9 +54,9 @@ qterm.1: qterm.1.in +@@ -53,10 +54,10 @@ $(SED) 's;qterm_etcdir;$(ETCDIR);g' < qterm.1.in > qterm.1 install: qterm qtermtab qterm.1 - ./mkinstalldirs $(BINDIR) $(ETCDIR) $(MANDIR)/man1 -+ ./mkinstalldirs $(BINDIR) $(EGDIR) $(MANDIR)/man1 - $(INSTALL) -m 755 qterm $(BINDIR) +- $(INSTALL) -m 755 qterm $(BINDIR) - $(INSTALL) -m 644 qtermtab $(TABFILE) -+ $(INSTALL) -m 644 qtermtab $(EGDIR) - $(INSTALL) -m 644 qterm.1 $(MANDIR)/man1 +- $(INSTALL) -m 644 qterm.1 $(MANDIR)/man1 ++ ./mkinstalldirs ${DESTDIR}$(BINDIR) ${DESTDIR}$(EGDIR) ${DESTDIR}$(MANDIR)/man1 ++ $(BSD_INSTALL_PROGRAM) qterm ${DESTDIR}$(BINDIR) ++ $(BSD_INSTALL_MAN) qtermtab ${DESTDIR}$(EGDIR) ++ $(BSD_INSTALL_MAN) qterm.1 ${DESTDIR}$(MANDIR)/man1 clean: + rm -f *.o core log *~ \#* qterm $(OBJS) diff --git a/misc/utftools/Makefile b/misc/utftools/Makefile index fe6e835291f..ec89cd9e341 100644 --- a/misc/utftools/Makefile +++ b/misc/utftools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:40 tv Exp $ +# $NetBSD: Makefile,v 1.7 2007/08/31 21:49:32 agc Exp $ # DISTNAME= utftools-1.6 @@ -7,10 +7,11 @@ CATEGORIES= misc MASTER_SITES= ftp://ftp.cs.yorku.ca/pub/wily/misc/ MAINTAINER= agc@NetBSD.org -#HOMEPAGE= +#HOMEPAGE= none COMMENT= UTF-aware wc, fmt, expand, and unexpand GNU_CONFIGURE= yes +PKG_DESTDIR_SUPPORT= user-destdir .include "../../misc/libutf/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/utftools/distinfo b/misc/utftools/distinfo index 762bc5a9573..569930e4ccf 100644 --- a/misc/utftools/distinfo +++ b/misc/utftools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:02:58 agc Exp $ +$NetBSD: distinfo,v 1.3 2007/08/31 21:49:32 agc Exp $ SHA1 (utftools-1.6.tar.gz) = 92406e9cc5f47fa0baa2d558b56175bc836431f1 RMD160 (utftools-1.6.tar.gz) = 7dfeda42ab72257dd92085e911b466175f3d0ff9 @@ -7,4 +7,4 @@ SHA1 (patch-aa) = c9b89b0b61fd1a51ab301748fc954676cfffc8ef SHA1 (patch-ab) = 0010909f1f83b8968275fb26c00e4c9bd4a534c4 SHA1 (patch-ac) = 4de3e61f6d11a0729a01f5efcffe9fcfe871e0ad SHA1 (patch-ad) = d5dadfa15d266aa1b5104f2f87dc39f481672639 -SHA1 (patch-ae) = e80fa5cb1ea5b1116bba8b0fe7f9ec93a55da7b6 +SHA1 (patch-ae) = 99e0701ae4788be9e1b1b5a36cc4a678401be453 diff --git a/misc/utftools/patches/patch-ae b/misc/utftools/patches/patch-ae index cc00147940b..679d6286fc8 100644 --- a/misc/utftools/patches/patch-ae +++ b/misc/utftools/patches/patch-ae @@ -1,15 +1,17 @@ -$NetBSD: patch-ae,v 1.1.1.1 2003/05/09 07:38:16 agc Exp $ +$NetBSD: patch-ae,v 1.2 2007/08/31 21:49:33 agc Exp $ ---- Makefile.in 2003/05/09 07:26:50 1.1 -+++ Makefile.in 2003/05/09 07:27:08 -@@ -39,8 +39,8 @@ +--- Makefile.in.orig 1997-02-25 18:47:26.000000000 +0000 ++++ Makefile.in 2007-08-31 12:23:48.000000000 +0100 +@@ -38,9 +38,9 @@ + all : $(BINS) install : all - $(srcdir)/mkinstalldirs $(BINDIR) $(MANDIR)/man1 +- $(srcdir)/mkinstalldirs $(BINDIR) $(MANDIR)/man1 - for bin in $(BINS) ; do $(INSTALL) $$bin $(BINDIR)/$$bin ; done - for man in $(MANS) ; do $(INSTALL_DATA) $(srcdir)/$$man $(MANDIR)/man1/$$man ; done -+ for bin in $(BINS) ; do $(INSTALL) $$bin $(BINDIR)/utf8-$$bin ; done -+ for man in $(MANS) ; do $(INSTALL_DATA) $(srcdir)/$$man $(MANDIR)/man1/utf8-$$man ; done ++ $(srcdir)/mkinstalldirs ${DESTDIR}$(BINDIR) ${DESTDIR}$(MANDIR)/man1 ++ for bin in $(BINS) ; do $(INSTALL) $$bin ${DESTDIR}$(BINDIR)/utf8-$$bin ; done ++ for man in $(MANS) ; do $(INSTALL_DATA) $(srcdir)/$$man ${DESTDIR}$(MANDIR)/man1/utf8-$$man ; done uninstall : -for bin in $(BINS) ; do rm $(BINDIR)/$$bin ; done -- cgit v1.2.3