diff options
| author | knu <knu@FreeBSD.org> | 2000-11-06 19:39:43 +0000 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2000-11-06 19:39:43 +0000 |
| commit | e3be7dd961c3c713d94d976070a9f3cc768f23f0 (patch) | |
| tree | 42d2dfd5c9ed4c4c5fb8429acdf065af510080a4 /irc | |
| parent | 378ff67b64d18f8799658f96944ceb7261eda804 (diff) | |
| download | FreeBSD-ports-e3be7dd961c3c713d94d976070a9f3cc768f23f0.zip FreeBSD-ports-e3be7dd961c3c713d94d976070a9f3cc768f23f0.tar.gz | |
Fix japanese/xchat which had been broken by the last two commits on
irc/xchat. As japanese/xchat "built" without a problem, I didn't
notice it was "broken"... In reality, the configure script failed to
detect the iconv library because of the removal of CPPFLAGS and LIBS
in CONFIGURE_ENV, therefore the built binary lacked Japanese support.
(i.e. the ja-xchat package included in 4.2-RELEASE will be broken)
To avoid this kind of sad accidents in future, add a note to irc/xchat
that it has a slave port and one should be careful not to overwrite
variables or targets.
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/xchat-gnome/Makefile | 9 | ||||
| -rw-r--r-- | irc/xchat/Makefile | 9 | ||||
| -rw-r--r-- | irc/xchat1/Makefile | 9 | ||||
| -rw-r--r-- | irc/xchat2/Makefile | 9 |
4 files changed, 28 insertions, 8 deletions
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 9bc401a..7f55005 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -12,6 +12,9 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ http://xchat.linuxpower.org/files/source/1.4/ MAINTAINER= jim@FreeBSD.org +# This port has a slave port japanese/xchat. Do not carelessly overwrite +# the variables or the targets defined in it. When you need to, please +# contact its maintainer. USE_X_PREFIX= yes USE_BZIP2= yes @@ -20,11 +23,13 @@ USE_PERL5= yes USE_IMLIB= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-python +# Assign with `+=' for slave ports +CONFIGURE_ARGS+=--disable-python .include <bsd.port.pre.mk> .if defined(WITH_SOCKS) +# Assign with `+=' for slave ports BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif @@ -36,7 +41,7 @@ CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 9bc401a..7f55005 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -12,6 +12,9 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ http://xchat.linuxpower.org/files/source/1.4/ MAINTAINER= jim@FreeBSD.org +# This port has a slave port japanese/xchat. Do not carelessly overwrite +# the variables or the targets defined in it. When you need to, please +# contact its maintainer. USE_X_PREFIX= yes USE_BZIP2= yes @@ -20,11 +23,13 @@ USE_PERL5= yes USE_IMLIB= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-python +# Assign with `+=' for slave ports +CONFIGURE_ARGS+=--disable-python .include <bsd.port.pre.mk> .if defined(WITH_SOCKS) +# Assign with `+=' for slave ports BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif @@ -36,7 +41,7 @@ CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index 9bc401a..7f55005 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -12,6 +12,9 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ http://xchat.linuxpower.org/files/source/1.4/ MAINTAINER= jim@FreeBSD.org +# This port has a slave port japanese/xchat. Do not carelessly overwrite +# the variables or the targets defined in it. When you need to, please +# contact its maintainer. USE_X_PREFIX= yes USE_BZIP2= yes @@ -20,11 +23,13 @@ USE_PERL5= yes USE_IMLIB= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-python +# Assign with `+=' for slave ports +CONFIGURE_ARGS+=--disable-python .include <bsd.port.pre.mk> .if defined(WITH_SOCKS) +# Assign with `+=' for slave ports BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif @@ -36,7 +41,7 @@ CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 9bc401a..7f55005 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -12,6 +12,9 @@ MASTER_SITES= http://xchat.org/files/source/1.4/ \ http://xchat.linuxpower.org/files/source/1.4/ MAINTAINER= jim@FreeBSD.org +# This port has a slave port japanese/xchat. Do not carelessly overwrite +# the variables or the targets defined in it. When you need to, please +# contact its maintainer. USE_X_PREFIX= yes USE_BZIP2= yes @@ -20,11 +23,13 @@ USE_PERL5= yes USE_IMLIB= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-python +# Assign with `+=' for slave ports +CONFIGURE_ARGS+=--disable-python .include <bsd.port.pre.mk> .if defined(WITH_SOCKS) +# Assign with `+=' for slave ports BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks .endif @@ -36,7 +41,7 @@ CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ |
