Date: Fri, 29 Aug 2014 13:24:29 +0400 From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: Tijl Coosemans <tijl@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r366468 - head/www/tidy-devel Message-ID: <20140829092429.GP55025@hades.panopticon> In-Reply-To: <201408290852.s7T8qj5n022717@svn.freebsd.org> References: <201408290852.s7T8qj5n022717@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
* Tijl Coosemans (tijl@FreeBSD.org) wrote:
> Log:
> Convert to USES=libtool and INSTALL_TARGET=install-strip
>
> Modified:
> head/www/tidy-devel/Makefile
> head/www/tidy-devel/pkg-plist
You should also fix some dependent ports which have
LIB_DEPENDS=libtidy-0.99.so
> Modified: head/www/tidy-devel/Makefile
> ==============================================================================
> --- head/www/tidy-devel/Makefile Fri Aug 29 08:24:19 2014 (r366467)
> +++ head/www/tidy-devel/Makefile Fri Aug 29 08:52:45 2014 (r366468)
> @@ -3,7 +3,7 @@
>
> PORTNAME?= tidy
> DISTVERSION= 090315-cvs
> -PORTREVISION= 1
> +PORTREVISION= 2
> CATEGORIES= www
> MASTER_SITES= ${MASTER_SITE_LOCAL}
> #MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \
> @@ -29,9 +29,11 @@ PLIST_SUB= SHLIB="@comment " NSHLIB=""
> MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX}
> CONFLICTS= tidy-20000804* tidy-lib-[0-9]*
> .else
> -USE_AUTOTOOLS= automake autoconf libtool
> +USES+= libtool
> +USE_AUTOTOOLS= aclocal automake autoconf libtoolize
> AUTOMAKE_ARGS+= -a -c --foreign
> USE_LDCONFIG= yes
> +INSTALL_TARGET= install-strip
> PLIST_SUB= SHLIB="" NSHLIB="@comment "
> CONFLICTS= tidy-devel-[0-9]*
> .endif
> @@ -84,28 +86,10 @@ post-patch:
> . endfor
> .endif
>
> -patch-autotools-libtool::
> -.if defined(WITH_SHLIB)
> - (cd ${WRKSRC} \
> - && ${LIBTOOLIZE} --force --copy \
> - && ${ACLOCAL} \
> - && ${REINPLACE_CMD} -e '/^_LT_AC_SHELL_INIT/d' aclocal.m4)
> - (cd ${PATCH_WRKSRC}; \
> - for ltf in ${LIBTOOLFILES}; do \
> - ${CP} $$ltf $$ltf.tmp; \
> - ${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
> - -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
> - $$ltf.tmp > $$ltf; \
> - done);
> -.endif
> -
> post-install:
> .for pgm in ${BIN2STRIP}
> ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pgm}
> .endfor
> -.if defined(WITH_SHLIB)
> - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtidy-0.99.so.0
> -.endif
> .if ${PORT_OPTIONS:MDOCS}
> @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
> ${MKDIR} ${STAGEDIR}${DOCSDIR}
>
> Modified: head/www/tidy-devel/pkg-plist
> ==============================================================================
> --- head/www/tidy-devel/pkg-plist Fri Aug 29 08:24:19 2014 (r366467)
> +++ head/www/tidy-devel/pkg-plist Fri Aug 29 08:52:45 2014 (r366468)
> @@ -5,8 +5,7 @@ include/tidy/platform.h
> include/tidy/tidy.h
> include/tidy/tidyenum.h
> %%SHLIB%%lib/libtidy-0.99.so.0
> -%%SHLIB%%lib/libtidy-0.99.so
> -%%SHLIB%%lib/libtidy.la
> +%%SHLIB%%lib/libtidy-0.99.so.0.0.0
> %%SHLIB%%lib/libtidy.so
> lib/libtidy.a
> %%NSHLIB%%man/man1/tidy.1.gz
--
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140829092429.GP55025>