Date: Mon, 18 Mar 2013 11:40:04 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314556 - in head: Mk/Uses converters/libiconv converters/libiconv/files devel/bison devel/gettext devel/libunistring devel/libvirt devel/patch ftp/wget security/gnupg1 security/gsasl t... Message-ID: <201303181140.r2IBe4tJ020934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Mar 18 11:40:04 2013 New Revision: 314556 URL: http://svnweb.freebsd.org/changeset/ports/314556 Log: Fix a long standing bug of lib/charset.alias being overwritten, modified, and badly tracked by ports. Make lib/charset.alias a file only provided by converters/libiconv Create a new USES: charsetfix, that will modify in post patch the Makefile.in to prevent a port from modifying/overwritting the charset.alias file during make install. Prevent devel/gettext from installing that files. Fix a couple of ports that actually touch charset.alias during the build phase. Based on a patch by ale (http://lists.freebsd.org/pipermail/freebsd-gnome/2012-October/027747.html) Approved by: kwm (gnome) Exp-run by: miwi Added: head/Mk/Uses/charsetfix.mk (contents, props changed) Deleted: head/converters/libiconv/files/patch-ae Modified: head/converters/libiconv/Makefile head/converters/libiconv/files/patch-libcharset::lib::config.charset head/converters/libiconv/pkg-plist head/devel/bison/Makefile head/devel/gettext/Makefile head/devel/gettext/pkg-plist head/devel/libunistring/Makefile head/devel/libvirt/Makefile head/devel/patch/Makefile head/ftp/wget/Makefile head/security/gnupg1/Makefile head/security/gsasl/Makefile head/textproc/diffutils/Makefile head/textproc/gsed/Makefile head/x11/gnome-libs/Makefile Added: head/Mk/Uses/charsetfix.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/charsetfix.mk Mon Mar 18 11:40:04 2013 (r314556) @@ -0,0 +1,29 @@ +# $FreeBSD$ +# +# Lookup in Makefile.in to prevent a package from installing/modifying charset.alias +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: charsetfix +# Usage: USES=charsetfix +# Valid ARGS: does not require args +# +# +.if !defined(_INCLUDE_USES_CHARSETFIX_MK) +_INCLUDE_USES_CHARSETFIX_MK= yes + +.if defined(charsetfix_ARGS) +IGNORE= USES=charsetfix does not require args +.endif + +CHARSETFIX_MAKEFILEIN?= Makefile.in + +post-patch: charsetfix-post-patch + +charsetfix-post-patch: + @${FIND} ${WRKSRC} -name "${CHARSETFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} \ + -e 's|need_charset_alias=true|need_charset_alias=false|g ; \ + s|test -f $$(charset_alias)|false|g ;\ + s|test -f $$(DESTDIR)$$(libdir)/charset.alias|false|g' + +.endif Modified: head/converters/libiconv/Makefile ============================================================================== --- head/converters/libiconv/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/converters/libiconv/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -3,6 +3,7 @@ PORTNAME= libiconv PORTVERSION= 1.14 +PORTREVISION= 1 CATEGORIES= converters devel MASTER_SITES= GNU Modified: head/converters/libiconv/files/patch-libcharset::lib::config.charset ============================================================================== --- head/converters/libiconv/files/patch-libcharset::lib::config.charset Mon Mar 18 11:39:55 2013 (r314555) +++ head/converters/libiconv/files/patch-libcharset::lib::config.charset Mon Mar 18 11:40:04 2013 (r314556) @@ -35,8 +35,8 @@ + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "Big5 BIG5" ++ echo "Big5HKSCS BIG5-HKSCS" + echo "SJIS SHIFT_JIS" -+ echo "Shift_JIS SHIFT_JIS" + ;; netbsd*) echo "646 ASCII" Modified: head/converters/libiconv/pkg-plist ============================================================================== --- head/converters/libiconv/pkg-plist Mon Mar 18 11:39:55 2013 (r314555) +++ head/converters/libiconv/pkg-plist Mon Mar 18 11:40:04 2013 (r314556) @@ -2,6 +2,7 @@ bin/iconv include/iconv.h include/libcharset.h include/localcharset.h +lib/charset.alias lib/libcharset.a lib/libcharset.la lib/libcharset.so @@ -10,7 +11,6 @@ lib/libiconv.a lib/libiconv.la lib/libiconv.so lib/libiconv.so.3 -libdata/charset.alias %%DOCSDIR%%/iconv.1.html %%DOCSDIR%%/iconv.3.html %%DOCSDIR%%/iconv_close.3.html Modified: head/devel/bison/Makefile ============================================================================== --- head/devel/bison/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/bison/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -14,6 +14,7 @@ COMMENT= A parser generator from FSF, (m BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +USES= charsetfix USE_XZ= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes Modified: head/devel/gettext/Makefile ============================================================================== --- head/devel/gettext/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/gettext/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,12 +1,9 @@ -# New ports collection makefile for: gettext -# Date created: 16 March 1998 -# Whom: Yukihiro Nakai <Nakai@technologist.com> -# +# Created by: Yukihiro Nakai <Nakai@technologist.com> # $FreeBSD$ -# PORTNAME= gettext PORTVERSION= 0.18.1.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gettext @@ -17,6 +14,7 @@ MASTER_SITE_SUBDIR= gettext MAINTAINER= autotools@FreeBSD.org COMMENT= GNU gettext package +USES= charsetfix USE_ICONV= yes LIBTOOLFILES= gettext-runtime/configure \ gettext-runtime/libasprintf/configure gettext-tools/configure Modified: head/devel/gettext/pkg-plist ============================================================================== --- head/devel/gettext/pkg-plist Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/gettext/pkg-plist Mon Mar 18 11:40:04 2013 (r314556) @@ -25,7 +25,6 @@ include/autosprintf.h include/gettext-po.h include/libintl.h @exec /bin/mkdir -p %D/lib/gettext -lib/charset.alias lib/libasprintf.a lib/libasprintf.la lib/libasprintf.so Modified: head/devel/libunistring/Makefile ============================================================================== --- head/devel/libunistring/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/libunistring/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libunistring -# Date created: 2011-05-17 -# Whom: Takefu -# +# Created by: Takefu # $FreeBSD$ -# PORTNAME= libunistring PORTVERSION= 0.9.3 @@ -18,6 +14,7 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB +USES= charsetfix USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/libvirt/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -39,8 +39,8 @@ PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" +USES= charsetfix pathfix USE_GMAKE= yes -USE_GNOME= gnomehack GNOME_MAKEFILEIN= Makefile.in USE_LDCONFIG= yes USE_PYTHON_BUILD= yes Modified: head/devel/patch/Makefile ============================================================================== --- head/devel/patch/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/devel/patch/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,9 +1,5 @@ -# New ports collection makefile for: patch -# Date created: 21 Jan 1998 -# Whom: ache -# +# Created by: ache # $FreeBSD$ -# PORTNAME= patch PORTVERSION= 2.7 @@ -21,6 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--program-prefix=g USE_GMAKE= yes USE_XZ= yes +USES= charsetfix MAN1= gpatch.1 PLIST_FILES= bin/gpatch Modified: head/ftp/wget/Makefile ============================================================================== --- head/ftp/wget/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/ftp/wget/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,9 +1,5 @@ -# Ports collection makefile for: wget -# Date created: 31 December 1996 -# Whom: Thomas Gellekum <tg@FreeBSD.org> -# +# Created by: Thomas Gellekum <tg@FreeBSD.org> # $FreeBSD$ -# PORTNAME= wget DISTVERSION= 1.14 @@ -14,6 +10,7 @@ MASTER_SITE_SUBDIR= wget MAINTAINER= vd@FreeBSD.org COMMENT= Retrieve files from the Net via HTTP(S) and FTP +USES= charsetfix USE_XZ= yes USE_GMAKE= yes USE_PERL5_BUILD=yes Modified: head/security/gnupg1/Makefile ============================================================================== --- head/security/gnupg1/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/security/gnupg1/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -12,6 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= The GNU Privacy Guard +USES= charsetfix USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES Modified: head/security/gsasl/Makefile ============================================================================== --- head/security/gsasl/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/security/gsasl/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: gsasl -# Date created: Oct 18, 2003 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= gsasl PORTVERSION= 1.8.0 @@ -21,6 +16,7 @@ LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libi gnutls.26:${PORTSDIR}/security/gnutls \ ntlm.0:${PORTSDIR}/security/libntlm +USES= charsetfix USE_GNOME= gnomehack pkgconfig USE_PERL5_BUILD= yes GNU_CONFIGURE= yes Modified: head/textproc/diffutils/Makefile ============================================================================== --- head/textproc/diffutils/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/textproc/diffutils/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,9 +1,5 @@ -# New ports collection makefile for: diffutils -# Date created: 5 September 2001 -# Whom: Garrett Rooney <rooneg@electricjellyfish.net> -# +# Created by: Garrett Rooney <rooneg@electricjellyfish.net> # $FreeBSD$ -# PORTNAME= diffutils PORTVERSION= 3.2 @@ -16,6 +12,7 @@ COMMENT= The GNU diff utilities LIB_DEPENDS= sigsegv:${PORTSDIR}/devel/libsigsegv +USES= charsetfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g Modified: head/textproc/gsed/Makefile ============================================================================== --- head/textproc/gsed/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/textproc/gsed/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sed -# Date created: 12 October 2000 -# Whom: Cyrille Lefevre <clefevre@citeweb.net> -# +# Created by: Cyrille Lefevre <clefevre@citeweb.net> # $FreeBSD$ -# PORTNAME= sed PORTVERSION= 4.2.1 @@ -19,6 +15,7 @@ COMMENT= The GNU stream editor GNU_CONFIGURE= yes CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" +USES= charsetfix PATCH_SUBDIRS= . doc lib sed DATADIR= ${PREFIX}/share/${PKGBASE} SAMP_FILES= binary*.sed dc.sed Modified: head/x11/gnome-libs/Makefile ============================================================================== --- head/x11/gnome-libs/Makefile Mon Mar 18 11:39:55 2013 (r314555) +++ head/x11/gnome-libs/Makefile Mon Mar 18 11:40:04 2013 (r314556) @@ -1,11 +1,6 @@ -# New ports collection makefile for: gnomelibs -# Date created: 17 June 1998 -# Whom: Yukihiro Nakai <Nakai@technologist.com> -# +# Created by: Yukihiro Nakai <Nakai@technologist.com> # $FreeBSD$ # $MCom: ports/x11/gnome-libs/Makefile,v 1.7 2007/08/04 03:51:32 marcus Exp $ -# - PORTNAME= gnome-libs PORTVERSION= 1.4.2 PORTREVISION= 18 @@ -20,6 +15,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSD LIB_DEPENDS= png15:${PORTSDIR}/graphics/png RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian +USES= charsetfix USE_BZIP2= yes USE_XORG= xpm ice x11 USE_PERL5= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303181140.r2IBe4tJ020934>