From 56513cced7fac3b7e2c16e7bc15735fdd6bc37dc Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Wed, 12 Feb 2014 19:15:41 +0000 Subject: [PATCH] Now that this port is unbroken, - add stage support - make prefix/localbase clean --- misc/utftools/Makefile | 5 +---- misc/utftools/files/patch-Makefile.in | 14 ++++++++------ misc/utftools/pkg-plist | 4 ++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/misc/utftools/Makefile b/misc/utftools/Makefile index 181169e59fa5..740b332a3112 100644 --- a/misc/utftools/Makefile +++ b/misc/utftools/Makefile @@ -12,9 +12,6 @@ COMMENT= UTF-aware wc, fmt, expand, and unexpand BUILD_DEPENDS= ${LOCALBASE}/lib/libutf.a:${PORTSDIR}/misc/libutf GNU_CONFIGURE= yes -CONFIGURE_ARGS+= '--libdir=${PREFIX}/lib' +CONFIGURE_ARGS= --libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include -MAN1= utf8-expand.1 utf8-fmt.1 utf8-unexpand.1 utf8-wc.1 - -NO_STAGE= yes .include diff --git a/misc/utftools/files/patch-Makefile.in b/misc/utftools/files/patch-Makefile.in index 1204279524fe..fec05896f5dd 100644 --- a/misc/utftools/files/patch-Makefile.in +++ b/misc/utftools/files/patch-Makefile.in @@ -1,13 +1,15 @@ ---- Makefile.in.orig Sat May 10 13:57:39 2003 -+++ Makefile.in Sat May 10 14:01:43 2003 -@@ -39,8 +39,8 @@ +--- ./Makefile.in.orig 1997-02-25 18:47:26.000000000 +0000 ++++ ./Makefile.in 2014-02-12 19:07:37.000000000 +0000 +@@ -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 diff --git a/misc/utftools/pkg-plist b/misc/utftools/pkg-plist index 4202ddd899df..620fcb4a7e1a 100644 --- a/misc/utftools/pkg-plist +++ b/misc/utftools/pkg-plist @@ -2,3 +2,7 @@ bin/utf8-expand bin/utf8-fmt bin/utf8-unexpand bin/utf8-wc +man/man1/utf8-expand.1.gz +man/man1/utf8-fmt.1.gz +man/man1/utf8-unexpand.1.gz +man/man1/utf8-wc.1.gz