Date: Tue, 27 Apr 1999 02:41:09 -0500 From: Shawn Leas <sleas@ixion.honeywell.com> To: ports@FreeBSD.ORG Cc: Michael Haro <mharo@area51.fremont.ca.us> Subject: Re: PATCH for eterm-0.8.9 port (important bugfixes) OOPS!!! Message-ID: <19990427024109.A1808@ixion.honeywell.com> In-Reply-To: <19990427020551.A29269@ixion.honeywell.com>; from Shawn Leas on Tue, Apr 27, 1999 at 02:05:51AM -0500 References: <19990427020551.A29269@ixion.honeywell.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=us-ascii Here's a fixed patch. I forgot to remove --no-reexec and --cache-file="./config.cache" or something or other... This one will work. On Tue, Apr 27, 1999 at 02:05:51AM -0500, Shawn Leas wrote: > Well, could someone check this patch out and check it into > CVS if it looks good? I've built and verified the packing list > is ok, etc... > > Lemme know! -- Shawn <=========== America Held Hostage ===========> Day 2288 for the poor and the middle class. Day 2307 for the rich and the dead. 634 days remaining in the Raw Deal. <============================================> --7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ETERM-0.8.8-to-0.8.9.port.patch" diff -urN -x CVS eterm.old/Makefile eterm/Makefile --- eterm.old/Makefile Tue Apr 27 00:19:25 1999 +++ eterm/Makefile Tue Apr 27 01:32:37 1999 @@ -1,13 +1,13 @@ # New ports collection makefile for: eterm -# Version required: 0.8.8 -# Date created: 24 November 1997 +# Version required: 0.8.9 +# Date created: 27 April 1999 # Whom: Murray Stokely <murray@cdrom.com> # # $Id: Makefile,v 1.16 1999/03/15 18:30:05 nectar Exp $ # -DISTNAME= Eterm-0.8.8 -PKGNAME= eterm-0.8.8 +DISTNAME= Eterm-0.8.9 +PKGNAME= eterm-0.8.9 CATEGORIES= x11 MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \ http://eterm.is.nontoxic.org/download/ \ @@ -38,16 +38,13 @@ post-install: chown root.wheel ${PREFIX}/bin/Eterm chmod 4755 ${PREFIX}/bin/Eterm - ${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm .ifndef NOPORTDOCS ${MKDIR} ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/doc/Eterm + ${INSTALL_DATA} ${WRKSRC}/doc/Eterm_reference.html ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/menu_cmd ${PREFIX}/share/doc/Eterm .endif .include <bsd.port.mk> diff -urN -x CVS eterm.old/files/md5 eterm/files/md5 --- eterm.old/files/md5 Tue Apr 27 00:19:25 1999 +++ eterm/files/md5 Tue Apr 27 01:21:11 1999 @@ -1 +1 @@ -MD5 (Eterm-0.8.8.tar.gz) = 19c0571f900757e5a90ac36baac3f79b +MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519 diff -urN -x CVS eterm.old/patches/patch-aa eterm/patches/patch-aa --- eterm.old/patches/patch-aa Tue Apr 27 00:19:25 1999 +++ eterm/patches/patch-aa Tue Apr 27 01:21:11 1999 @@ -1,13 +1,13 @@ ---- configure Wed Jan 13 05:53:30 1999 -+++ configure~ Sun Feb 7 23:17:02 1999 -@@ -1559,8 +1559,8 @@ - # Actually configure libtool. ac_aux_dir is where install-sh is found. +--- configure Mon Apr 19 18:47:32 1999 ++++ configure~ Tue Apr 27 00:10:54 1999 +@@ -2135,8 +2135,8 @@ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + 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} ${LOCALBASE}/share/libtool/ltconfig \ ++${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig --no-reexec \ +$libtool_flags --no-verify ${LOCALBASE}/share/libtool/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - + # Reload cache, that may have been modified by ltconfig diff -urN -x CVS eterm.old/patches/patch-ac eterm/patches/patch-ac --- eterm.old/patches/patch-ac Tue Apr 27 00:19:25 1999 +++ eterm/patches/patch-ac Tue Apr 27 01:21:11 1999 @@ -1,14 +1,12 @@ -*** src/Makefile.in Wed Jan 13 05:54:45 1999 ---- src/Makefile.in~ Sun Feb 7 23:00:35 1999 -*************** -*** 123,128 **** ---- 123,131 ---- - system.h threads.h graphics/Makefile.am graphics/Makefile.in \ - graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h \ - graphics/qplot.c Eterm.xpm -+ ifeq ($(PORTOBJFORMAT),elf) -+ LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib -+ endif - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = +--- src/Makefile.in Tue Apr 27 00:48:40 1999 ++++ src/Makefile.in~ Tue Apr 27 00:48:45 1999 +@@ -121,6 +121,9 @@ + + EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h eterm_imlib.h feature.h.in graphics.h grkelot.h grx.h main.h menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h system.h threads.h graphics/Makefile.am graphics/Makefile.in graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h graphics/qplot.c Eterm.xpm + ++ifeq ($(PORTOBJFORMAT),elf) ++LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib ++endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff -urN -x CVS eterm.old/pkg/PLIST eterm/pkg/PLIST --- eterm.old/pkg/PLIST Mon Feb 22 05:31:59 1999 +++ eterm/pkg/PLIST Tue Apr 27 01:56:01 1999 @@ -1,32 +1,14 @@ -bin/Eterm -bin/Esetroot lib/libmej.so.8 -lib/libmej.so lib/libmej.la lib/libmej.a lib/libEterm.so.8 -lib/libEterm.so lib/libEterm.la lib/libEterm.a -share/doc/Eterm/ReleaseNotes -share/doc/Eterm/Eterm.help -share/doc/Eterm/Eterm.ref -share/doc/Eterm/Eterm.tcap -share/doc/Eterm/Eterm.ti -share/doc/Eterm/FAQ.html -share/doc/Eterm/menu_cmd -share/Eterm/pix/014.png -share/Eterm/pix/backwave.jpg -share/Eterm/pix/button1.jpg -share/Eterm/pix/button5.jpg -share/Eterm/pix/circuit.png -share/Eterm/pix/nebula.jpg -share/Eterm/pix/fourthday.jpg -share/Eterm/pix/gaia.jpg -share/Eterm/pix/galleon.jpg -share/Eterm/pix/night_of_the_dragon.jpg -share/Eterm/pix/pixmaps.list -share/Eterm/colortest.sh +bin/Eterm +bin/Esetroot +bin/Etbg +bin/Etcolors.sh +bin/Etmenu.sh share/Eterm/themes/Eterm/MAIN share/Eterm/themes/Eterm/Eterm.menu share/Eterm/themes/Eterm/pixmaps.list @@ -47,6 +29,22 @@ share/Eterm/themes/trans/trans.menu share/Eterm/themes/trans/MAIN share/Eterm/themes/trans/pixmaps.list +share/Eterm/pix/014.png +share/Eterm/pix/backwave.jpg +share/Eterm/pix/button1.jpg +share/Eterm/pix/button5.jpg +share/Eterm/pix/circuit.png +share/Eterm/pix/nebula.jpg +share/Eterm/pix/fourthday.jpg +share/Eterm/pix/gaia.jpg +share/Eterm/pix/galleon.jpg +share/Eterm/pix/night_of_the_dragon.jpg +share/Eterm/pix/pixmaps.list +share/doc/Eterm/ReleaseNotes +share/doc/Eterm/Eterm_reference.html +share/doc/Eterm/Eterm.tcap +share/doc/Eterm/Eterm.ti +share/doc/Eterm/FAQ.html @dirrm share/doc/Eterm @dirrm share/Eterm/themes/Eterm @dirrm share/Eterm/themes/chooser diff -urN -x CVS eterm.old/Makefile eterm/Makefile --- eterm.old/Makefile Tue Apr 27 00:19:25 1999 +++ eterm/Makefile Tue Apr 27 02:28:08 1999 @@ -1,13 +1,13 @@ # New ports collection makefile for: eterm -# Version required: 0.8.8 -# Date created: 24 November 1997 +# Version required: 0.8.9 +# Date created: 27 April 1999 # Whom: Murray Stokely <murray@cdrom.com> # # $Id: Makefile,v 1.16 1999/03/15 18:30:05 nectar Exp $ # -DISTNAME= Eterm-0.8.8 -PKGNAME= eterm-0.8.8 +DISTNAME= Eterm-0.8.9 +PKGNAME= eterm-0.8.9 CATEGORIES= x11 MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \ http://eterm.is.nontoxic.org/download/ \ @@ -38,16 +38,13 @@ post-install: chown root.wheel ${PREFIX}/bin/Eterm chmod 4755 ${PREFIX}/bin/Eterm - ${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm .ifndef NOPORTDOCS ${MKDIR} ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/doc/Eterm + ${INSTALL_DATA} ${WRKSRC}/doc/Eterm_reference.html ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm ${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/doc/Eterm - ${INSTALL_DATA} ${WRKSRC}/doc/menu_cmd ${PREFIX}/share/doc/Eterm .endif .include <bsd.port.mk> diff -urN -x CVS eterm.old/files/md5 eterm/files/md5 --- eterm.old/files/md5 Tue Apr 27 00:19:25 1999 +++ eterm/files/md5 Tue Apr 27 02:28:08 1999 @@ -1 +1 @@ -MD5 (Eterm-0.8.8.tar.gz) = 19c0571f900757e5a90ac36baac3f79b +MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519 diff -urN -x CVS eterm.old/patches/patch-aa eterm/patches/patch-aa --- eterm.old/patches/patch-aa Tue Apr 27 00:19:25 1999 +++ eterm/patches/patch-aa Tue Apr 27 02:28:08 1999 @@ -1,13 +1,13 @@ ---- configure Wed Jan 13 05:53:30 1999 -+++ configure~ Sun Feb 7 23:17:02 1999 -@@ -1559,8 +1559,8 @@ - # Actually configure libtool. ac_aux_dir is where install-sh is found. +--- configure Mon Apr 19 18:47:32 1999 ++++ configure~ Tue Apr 27 00:10:54 1999 +@@ -2135,8 +2135,8 @@ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + 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} ${LOCALBASE}/share/libtool/ltconfig \ ++${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig --no-reexec \ +$libtool_flags --no-verify ${LOCALBASE}/share/libtool/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - + # Reload cache, that may have been modified by ltconfig diff -urN -x CVS eterm.old/patches/patch-ac eterm/patches/patch-ac --- eterm.old/patches/patch-ac Tue Apr 27 00:19:25 1999 +++ eterm/patches/patch-ac Tue Apr 27 02:28:08 1999 @@ -1,14 +1,12 @@ -*** src/Makefile.in Wed Jan 13 05:54:45 1999 ---- src/Makefile.in~ Sun Feb 7 23:00:35 1999 -*************** -*** 123,128 **** ---- 123,131 ---- - system.h threads.h graphics/Makefile.am graphics/Makefile.in \ - graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h \ - graphics/qplot.c Eterm.xpm -+ ifeq ($(PORTOBJFORMAT),elf) -+ LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib -+ endif - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = +--- src/Makefile.in Tue Apr 27 00:48:40 1999 ++++ src/Makefile.in~ Tue Apr 27 00:48:45 1999 +@@ -121,6 +121,9 @@ + + EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h eterm_imlib.h feature.h.in graphics.h grkelot.h grx.h main.h menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h system.h threads.h graphics/Makefile.am graphics/Makefile.in graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h graphics/qplot.c Eterm.xpm + ++ifeq ($(PORTOBJFORMAT),elf) ++LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib ++endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff -urN -x CVS eterm.old/patches/patch-ad eterm/patches/patch-ad --- eterm.old/patches/patch-ad Wed Dec 31 18:00:00 1969 +++ eterm/patches/patch-ad Tue Apr 27 02:31:23 1999 @@ -0,0 +1,20 @@ +--- configure Tue Apr 27 02:29:40 1999 ++++ configure~ Tue Apr 27 02:30:42 1999 +@@ -1859,7 +1859,7 @@ + + + # Check for any special flags to pass to ltconfig. +-libtool_flags="--cache-file=$cache_file" ++libtool_flags= + test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" + test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" + test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +@@ -2135,7 +2135,7 @@ + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ + DLLTOOL="$DLLTOOL" AS="$AS" \ +-${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig --no-reexec \ ++${CONFIG_SHELL-/bin/sh} ${LOCALBASE}/share/libtool/ltconfig \ + $libtool_flags --no-verify ${LOCALBASE}/share/libtool/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + diff -urN -x CVS eterm.old/pkg/PLIST eterm/pkg/PLIST --- eterm.old/pkg/PLIST Mon Feb 22 05:31:59 1999 +++ eterm/pkg/PLIST Tue Apr 27 02:28:08 1999 @@ -1,32 +1,14 @@ -bin/Eterm -bin/Esetroot lib/libmej.so.8 -lib/libmej.so lib/libmej.la lib/libmej.a lib/libEterm.so.8 -lib/libEterm.so lib/libEterm.la lib/libEterm.a -share/doc/Eterm/ReleaseNotes -share/doc/Eterm/Eterm.help -share/doc/Eterm/Eterm.ref -share/doc/Eterm/Eterm.tcap -share/doc/Eterm/Eterm.ti -share/doc/Eterm/FAQ.html -share/doc/Eterm/menu_cmd -share/Eterm/pix/014.png -share/Eterm/pix/backwave.jpg -share/Eterm/pix/button1.jpg -share/Eterm/pix/button5.jpg -share/Eterm/pix/circuit.png -share/Eterm/pix/nebula.jpg -share/Eterm/pix/fourthday.jpg -share/Eterm/pix/gaia.jpg -share/Eterm/pix/galleon.jpg -share/Eterm/pix/night_of_the_dragon.jpg -share/Eterm/pix/pixmaps.list -share/Eterm/colortest.sh +bin/Eterm +bin/Esetroot +bin/Etbg +bin/Etcolors.sh +bin/Etmenu.sh share/Eterm/themes/Eterm/MAIN share/Eterm/themes/Eterm/Eterm.menu share/Eterm/themes/Eterm/pixmaps.list @@ -47,6 +29,22 @@ share/Eterm/themes/trans/trans.menu share/Eterm/themes/trans/MAIN share/Eterm/themes/trans/pixmaps.list +share/Eterm/pix/014.png +share/Eterm/pix/backwave.jpg +share/Eterm/pix/button1.jpg +share/Eterm/pix/button5.jpg +share/Eterm/pix/circuit.png +share/Eterm/pix/nebula.jpg +share/Eterm/pix/fourthday.jpg +share/Eterm/pix/gaia.jpg +share/Eterm/pix/galleon.jpg +share/Eterm/pix/night_of_the_dragon.jpg +share/Eterm/pix/pixmaps.list +share/doc/Eterm/ReleaseNotes +share/doc/Eterm/Eterm_reference.html +share/doc/Eterm/Eterm.tcap +share/doc/Eterm/Eterm.ti +share/doc/Eterm/FAQ.html @dirrm share/doc/Eterm @dirrm share/Eterm/themes/Eterm @dirrm share/Eterm/themes/chooser --7AUc2qLy4jB3hD7Z-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990427024109.A1808>