aboutsummaryrefslogtreecommitdiff
path: root/korean
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-03-31 03:12:48 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-03-31 03:12:48 +0000
commit1e5de1c84f5a9cda45fa6931087de24e4bae8213 (patch)
treeaf8e903758c716026c5f81d757f416479d09de03 /korean
parent0d089f0cc8af77a0192118f92602c80382aac9a2 (diff)
downloadports-1e5de1c84f5a9cda45fa6931087de24e4bae8213.tar.gz
ports-1e5de1c84f5a9cda45fa6931087de24e4bae8213.zip
Remove #include <malloc.h>
Set GNU_CONFIGURE since this port uses it Don't use an internal libtool, use the system one. Port build is still broken on -current because of expr(1) abuse in the libtool port.
Notes
Notes: svn path=/head/; revision=57006
Diffstat (limited to 'korean')
-rw-r--r--korean/eterm/Makefile7
-rw-r--r--korean/eterm/files/patch-ag26
2 files changed, 32 insertions, 1 deletions
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index d49ddc0b6272..33bfd1030e30 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -24,9 +24,14 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
USE_IMLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4"
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4" LOCALBASE="${LOCALBASE}"
MAN1= Eterm.1
+pre-patch:
+ @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ ${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c
+
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/Eterm
diff --git a/korean/eterm/files/patch-ag b/korean/eterm/files/patch-ag
new file mode 100644
index 000000000000..1a61f9c5851d
--- /dev/null
+++ b/korean/eterm/files/patch-ag
@@ -0,0 +1,26 @@
+--- configure.orig Mon Apr 19 16:47:32 1999
++++ configure Sat Mar 30 19:11:43 2002
+@@ -2135,8 +2135,8 @@
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+ DLLTOOL="$DLLTOOL" AS="$AS" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+ # Reload cache, that may have been modified by ltconfig
+@@ -2150,10 +2150,8 @@
+
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
++LIBTOOL="${LOCALBASE}/bin/libtool"
+
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.