diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-11-12 17:35:09 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-11-12 17:35:09 +0000 |
| commit | cd9bf1863269fbc2704bf7c340f60116ea4da27c (patch) | |
| tree | 5ff0282ba22581c0aac9abb67df80b6d996fce02 /net/yaz | |
| parent | b4db9e33c9d59b91960009344b7a6e53b8505e92 (diff) | |
| download | ports-cd9bf1863269fbc2704bf7c340f60116ea4da27c.tar.gz ports-cd9bf1863269fbc2704bf7c340f60116ea4da27c.zip | |
Notes
Diffstat (limited to 'net/yaz')
| -rw-r--r-- | net/yaz/Makefile | 7 | ||||
| -rw-r--r-- | net/yaz/files/extrapatch-doc__Makefile.in | 22 | ||||
| -rw-r--r-- | net/yaz/files/patch-Makefile.in | 15 |
3 files changed, 24 insertions, 20 deletions
diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 932aba37dfea..ecacadd8650d 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu USE_ICONV= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GNOME= libxml2 libxslt +USE_GNOME= libxml2 libxslt gnomehack USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes @@ -33,11 +33,8 @@ MAN1= yaz-asncomp.1 yaz-client.1 yaz-iconv.1 \ MAN7= bib1-attr.7 yaz-log.7 yaz.7 MAN8= yaz-config.8 yaz-ztest.8 -post-patch: .if defined(NOPORTDOCS) - @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%//' Makefile.in -.else - @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%/doc/' Makefile.in +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-doc__Makefile.in .endif post-configure: diff --git a/net/yaz/files/extrapatch-doc__Makefile.in b/net/yaz/files/extrapatch-doc__Makefile.in new file mode 100644 index 000000000000..be52a425d83c --- /dev/null +++ b/net/yaz/files/extrapatch-doc__Makefile.in @@ -0,0 +1,22 @@ +--- ./doc/Makefile.in.orig 2010-11-12 20:17:48.634411873 +0300 ++++ ./doc/Makefile.in 2010-11-12 20:28:51.973149234 +0300 +@@ -264,7 +264,6 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = common + XMLFILES = bookinfo.xml introduction.xml installation.xml \ + indexdata.xml \ + asn.xml tools.xml odr.xml comstack.xml server.xml license.xml \ +@@ -729,9 +728,9 @@ + + info-am: + +-install-data-am: install-docDATA install-man ++install-data-am: install-man + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook ++ $(MAKE) $(AM_MAKEFLAGS) + install-dvi: install-dvi-recursive + + install-dvi-am: diff --git a/net/yaz/files/patch-Makefile.in b/net/yaz/files/patch-Makefile.in deleted file mode 100644 index 56aa032a1200..000000000000 --- a/net/yaz/files/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- ./Makefile.in.orig 2010-08-17 12:42:04.000000000 +0200 -+++ Makefile.in 2010-11-04 17:52:13.000000000 +0100 -@@ -280,10 +280,10 @@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src include util test client ztest zoom doc etc -+SUBDIRS = src include util test client ztest zoom %%DOC%% etc - aclocaldir = $(datadir)/aclocal - aclocal_DATA = m4/yaz.m4 --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = yaz.pc - SPEC_FILE = $(PACKAGE).spec - EXTRA_DIST = $(SPEC_FILE) README LICENSE NEWS \ |