From 65e65b2b7e728318835e1be883260a8b1499a033 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 10 Jun 2014 23:19:30 +0000 Subject: [PATCH] - Support staging - Switch to USES=libtool, drop .la files --- textproc/liblingoteach/Makefile | 11 +++++----- .../liblingoteach/files/patch-doc-Makefile.in | 11 ---------- .../files/patch-doc__Makefile.in | 22 +++++++++++++++++++ textproc/liblingoteach/pkg-plist | 3 +-- 4 files changed, 29 insertions(+), 18 deletions(-) delete mode 100644 textproc/liblingoteach/files/patch-doc-Makefile.in create mode 100644 textproc/liblingoteach/files/patch-doc__Makefile.in diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile index aa5f2fd25629..549f783727e4 100644 --- a/textproc/liblingoteach/Makefile +++ b/textproc/liblingoteach/Makefile @@ -2,19 +2,17 @@ PORTNAME= liblingoteach PORTVERSION= 0.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MASTER_SITES= SF/lingoteach/OldFiles MAINTAINER= ports@FreeBSD.org COMMENT= Library for parsing lesson files based on the LingoTeach DTD -USE_AUTOTOOLS= libtool -USES= gmake pathfix pkgconfig +USES= gmake pathfix pkgconfig libtool USE_GNOME= libxml2 GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes OPTIONS_DEFINE= DOCS ZLIB DEBUG OPTIONS_DEFAULT= ZLIB @@ -26,10 +24,13 @@ DEBUG_CONFIGURE_ENABLE= debug .include -.if !${PORT_OPTIONS:MDOCS} +.if ! ${PORT_OPTIONS:MDOCS} post-patch: @${REINPLACE_CMD} 's|SUBDIRS = src test doc|SUBDIRS = src test|' \ ${WRKSRC}/Makefile.in .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + .include diff --git a/textproc/liblingoteach/files/patch-doc-Makefile.in b/textproc/liblingoteach/files/patch-doc-Makefile.in deleted file mode 100644 index 12f40b6da58f..000000000000 --- a/textproc/liblingoteach/files/patch-doc-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Sun Oct 12 13:30:43 2003 -+++ doc/Makefile.in Tue Oct 14 23:35:13 2003 -@@ -88,7 +88,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --DOC_MODULE = liblingoteach-$(VERSION) -+DOC_MODULE = liblingoteach - HTML_DIR = $(datadir)/doc - subdir = doc - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/textproc/liblingoteach/files/patch-doc__Makefile.in b/textproc/liblingoteach/files/patch-doc__Makefile.in new file mode 100644 index 000000000000..3cce8a3c4b73 --- /dev/null +++ b/textproc/liblingoteach/files/patch-doc__Makefile.in @@ -0,0 +1,22 @@ +--- doc/Makefile.in.orig 2014-06-03 00:20:20.000000000 +0400 ++++ doc/Makefile.in 2014-06-03 04:37:01.000000000 +0400 +@@ -88,7 +88,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-DOC_MODULE = liblingoteach-$(VERSION) ++DOC_MODULE = liblingoteach + HTML_DIR = $(datadir)/doc + subdir = doc + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -215,8 +215,8 @@ + + + install: all +- -mkdir -p $(HTML_DIR)/$(DOC_MODULE) +- -cp -r html $(HTML_DIR)/$(DOC_MODULE) ++ -mkdir -p $(DESTDIR)$(HTML_DIR)/$(DOC_MODULE) ++ -cp -r html $(DESTDIR)$(HTML_DIR)/$(DOC_MODULE) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/textproc/liblingoteach/pkg-plist b/textproc/liblingoteach/pkg-plist index f7aac833d1df..e35ee6cff3c7 100644 --- a/textproc/liblingoteach/pkg-plist +++ b/textproc/liblingoteach/pkg-plist @@ -1,9 +1,8 @@ include/lingoteach/lingdefs.h include/lingoteach/lingoteach.h lib/liblingoteach.a -lib/liblingoteach.la lib/liblingoteach.so -lib/liblingoteach.so.3 +lib/liblingoteach.so.2.1.0 libdata/pkgconfig/liblingoteach.pc %%PORTDOCS%%%%DOCSDIR%%/html/a00010.html %%PORTDOCS%%%%DOCSDIR%%/html/a00011.html