aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/Uses/charsetfix.mk29
-rw-r--r--converters/libiconv/Makefile1
-rw-r--r--converters/libiconv/files/patch-ae63
-rw-r--r--converters/libiconv/files/patch-libcharset::lib::config.charset2
-rw-r--r--converters/libiconv/pkg-plist2
-rw-r--r--devel/bison/Makefile1
-rw-r--r--devel/gettext/Makefile8
-rw-r--r--devel/gettext/pkg-plist1
-rw-r--r--devel/libunistring/Makefile7
-rw-r--r--devel/libvirt/Makefile2
-rw-r--r--devel/patch/Makefile7
-rw-r--r--ftp/wget/Makefile7
-rw-r--r--security/gnupg1/Makefile1
-rw-r--r--security/gsasl/Makefile8
-rw-r--r--textproc/diffutils/Makefile7
-rw-r--r--textproc/gsed/Makefile7
-rw-r--r--x11/gnome-libs/Makefile8
17 files changed, 52 insertions, 109 deletions
diff --git a/Mk/Uses/charsetfix.mk b/Mk/Uses/charsetfix.mk
new file mode 100644
index 000000000000..06aca3b1f394
--- /dev/null
+++ b/Mk/Uses/charsetfix.mk
@@ -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
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index bdc415cb8f7a..3e03574f7e66 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libiconv
PORTVERSION= 1.14
+PORTREVISION= 1
CATEGORIES= converters devel
MASTER_SITES= GNU
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
deleted file mode 100644
index d9b1009744a2..000000000000
--- a/converters/libiconv/files/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
---- libcharset/lib/Makefile.in.orig 2009-03-26 08:01:00.000000000 -0400
-+++ libcharset/lib/Makefile.in 2009-06-06 15:28:00.000000000 -0400
-@@ -10,6 +10,7 @@ prefix = @prefix@
- local_prefix = /usr/local
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-+sysconfdir = ${exec_prefix}/libdata
-
- # Programs used by "make":
- CC = @CC@
-@@ -44,7 +45,7 @@ SHELL = /bin/sh
-
- # Before making a release, change this according to the libtool documentation,
- # section "Library interface versions".
--LIBCHARSET_VERSION_INFO = 1:0:0
-+LIBCHARSET_VERSION_INFO = 1
-
- # Needed by $(LIBTOOL).
- top_builddir = ..
-@@ -59,7 +60,7 @@ libcharset.la : $(OBJECTS)
- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
-
- localcharset.lo : $(srcdir)/localcharset.c
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
-
- relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
-@@ -80,7 +81,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- $(mkinstalldirs) $(libdir)
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+ $(LIBTOOL_INSTALL) cp libcharset.la $(libdir)/libcharset.la
- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
- || orig=charset.alias; \
- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-@@ -108,16 +109,17 @@ install : all force
- need_charset_alias=false ; \
- fi ; \
- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
-+ $(LIBTOOL_INSTALL) cp libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-+ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
-+ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- else \
- if $$need_charset_alias; then \
-- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- fi ; \
- fi
-
diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset::lib::config.charset
index f8bcbb5cf587..ba30603dc83a 100644
--- a/converters/libiconv/files/patch-libcharset::lib::config.charset
+++ b/converters/libiconv/files/patch-libcharset::lib::config.charset
@@ -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"
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index 884a181b62a8..fc450fbc5b6d 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -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
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 8398dcbec053..74c36b4ef6aa 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -14,6 +14,7 @@ COMMENT= A parser generator from FSF, (mostly) compatible with Yacc
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+USES= charsetfix
USE_XZ= yes
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index dc58f03bb69d..a43c72bad849 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -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
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index ffbbc5abce7a..c8ba969c9385 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -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
diff --git a/devel/libunistring/Makefile b/devel/libunistring/Makefile
index 173188c5ffb4..da140351dc68 100644
--- a/devel/libunistring/Makefile
+++ b/devel/libunistring/Makefile
@@ -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
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 35fad37a7086..503c5e6200f3 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -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
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 55235cc4c6d3..acf610e48faf 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -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
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 3c7129c15702..26aa27bac071 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -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
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index c4f44850492d..d88d489003c1 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -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
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 4f4770436dc9..dd7fe5a35411 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -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/libidn \
gnutls.26:${PORTSDIR}/security/gnutls \
ntlm.0:${PORTSDIR}/security/libntlm
+USES= charsetfix
USE_GNOME= gnomehack pkgconfig
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile
index 160ab9f56b05..e6e8ea039133 100644
--- a/textproc/diffutils/Makefile
+++ b/textproc/diffutils/Makefile
@@ -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
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 28b0f0c2e75b..6fea24020a08 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -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
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 1d163b2380ad..7d29735a321c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -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:${PORTSDIR}/textproc/rarian
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 06:32:08 +0000