From owner-freebsd-ports Sat Dec 27 18:10:06 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id SAA06711 for ports-outgoing; Sat, 27 Dec 1997 18:10:06 -0800 (PST) (envelope-from owner-freebsd-ports) Received: (from gnats@localhost) by hub.freebsd.org (8.8.7/8.8.7) id SAA06705; Sat, 27 Dec 1997 18:10:02 -0800 (PST) (envelope-from gnats) Date: Sat, 27 Dec 1997 18:10:02 -0800 (PST) Message-Id: <199712280210.SAA06705@hub.freebsd.org> To: freebsd-ports Cc: From: Don Croyle Subject: Re: ports/5157 Reply-To: Don Croyle Sender: owner-freebsd-ports@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk The following reply was made to PR ports/5157; it has been noted by GNATS. From: Don Croyle To: freebsd-gnats-submit@freebsd.org Cc: Subject: Re: ports/5157 Date: 27 Dec 1997 21:07:26 -0500 --Multipart_Sat_Dec_27_21:05:02_1997-1 Content-Type: text/plain; charset=US-ASCII The attached diffs upgrade the the eterm port from 0.6apl2 to 0.7+PL4. I've cleared this with the port's maintainer, Murray Stokely . This adds a patches directory and the files patches/patch-aa, patches/patch-ab, patches/patch-ac and patches/patch-ad to the port directory. If the diffs didn't come through unmangled, they can also be found at http://www.infonex.com/~dacroyle/ports/eterm.diff -- I've always wanted to be a dilettante, | Usenet II -- because but I've never quite been ready to make | it's time for October the commitment. | http://www.usenet2.org --Multipart_Sat_Dec_27_21:05:02_1997-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="eterm.diff" Content-Transfer-Encoding: 7bit diff -crN eterm.old/Makefile eterm/Makefile *** eterm.old/Makefile Sat Nov 29 18:43:27 1997 --- eterm/Makefile Wed Dec 24 23:54:09 1997 *************** *** 1,47 **** # New ports collection makefile for: eterm ! # Version required: 0.6apl2 # Date created: 24 November 1997 # Whom: Murray Stokely # # $Id: eterm.diff,v 1.1 1997/12/25 06:04:10 croyle Exp $ # ! DISTNAME= Eterm-DR-0.6aPL2 ! PKGNAME= eterm-0.6a2 CATEGORIES= x11 ! MASTER_SITES= ftp://cthulhu.mandrake.net/pub/Eterm/ MAINTAINER= murray@cdrom.com LIB_DEPENDS= Im\\.4\\.:${PORTSDIR}/graphics/imlib ! BROKEN= R_OK undefined ! WRKSRC= $(WRKDIR)/Eterm-DR-0.6a USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= Eterm.1 ! do-build: ! cd ${WRKSRC}/src && \ ! ${GMAKE} clean && \ ! ${GMAKE} FreeBSD && \ ! cd ../doc && \ ! ${GMAKE} alldoc ! ! do-install: ! ${INSTALL_PROGRAM} $(WRKSRC)/src/Eterm $(PREFIX)/bin ! ${INSTALL_PROGRAM} $(WRKSRC)/doc/dorand $(PREFIX)/bin ! ${INSTALL_SCRIPT} $(WRKSRC)/doc/random_pixmap.sh $(PREFIX)/bin ! ${INSTALL_MAN} $(WRKSRC)/doc/Eterm.1 $(PREFIX)/man/man1 ! ${MKDIR} $(PREFIX)/share/Eterm ! ${INSTALL_MAN} $(WRKSRC)/doc/FAQ $(PREFIX)/share/Eterm ! ${INSTALL_MAN} $(WRKSRC)/RELNOTES.Eterm $(PREFIX)/share/Eterm ${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm ! ${INSTALL_SCRIPT} ${WRKSRC}/doc/menu.sh ${PREFIX}/share/Eterm ! ${INSTALL_MAN} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/Eterm ! ${INSTALL_MAN} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/Eterm ! ${INSTALL_MAN} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/Eterm ! ${INSTALL_MAN} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/Eterm ! ${INSTALL_MAN} ${WRKSRC}/doc/MAIN.dist ${PREFIX}/share/Eterm .include --- 1,43 ---- # New ports collection makefile for: eterm ! # Version required: 0.7+PL4 # Date created: 24 November 1997 # Whom: Murray Stokely # # $Id: eterm.diff,v 1.1 1997/12/25 06:04:10 croyle Exp $ # ! DISTNAME= Eterm-DR-0.7+PL4 ! PKGNAME= eterm-0.7 CATEGORIES= x11 ! MASTER_SITES= ftp://ftp.mandrake.net/pub/Eterm/\ ! http://www.tcserv.com/archive/E/\ ! http://www.spd.louisville.edu/~mejenn01/archive/E/ MAINTAINER= murray@cdrom.com LIB_DEPENDS= Im\\.4\\.:${PORTSDIR}/graphics/imlib ! WRKSRC= $(WRKDIR)/Eterm-DR-0.7 USE_GMAKE= yes GNU_CONFIGURE= yes + USE_X11= yes MAN1= Eterm.1 + ALL_TARGET= FreeBSD ! post-install: ! strip ${PREFIX}/bin/Eterm ! chown root.wheel ${PREFIX}/bin/Eterm ! chmod 4755 ${PREFIX}/bin/Eterm ! .ifndef NOPORTDOCS ! ${INSTALL_DATA} ${WRKSRC}/RELNOTES.Eterm ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.menu ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/Eterm ${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm ! ${INSTALL_DATA} ${WRKSRC}/doc/menu_cmd ${PREFIX}/share/Eterm ! .endif .include diff -crN eterm.old/files/md5 eterm/files/md5 *** eterm.old/files/md5 Sun Nov 16 11:32:02 1997 --- eterm/files/md5 Tue Dec 23 15:28:48 1997 *************** *** 1 **** ! MD5 (Eterm-DR-0.6aPL2.tar.gz) = bba0554d1a20359855ba40581df8be57 --- 1 ---- ! MD5 (Eterm-DR-0.7+PL4.tar.gz) = 441d631c3e4e478fb79b9e389bdbb17c diff -crN eterm.old/patches/patch-aa eterm/patches/patch-aa *** eterm.old/patches/patch-aa Wed Dec 31 19:00:00 1969 --- eterm/patches/patch-aa Tue Dec 23 16:27:21 1997 *************** *** 0 **** --- 1,12 ---- + *** libmej/strings.h.orig Sun Dec 7 23:34:26 1997 + --- libmej/strings.h Tue Dec 23 15:58:21 1997 + *************** + *** 57,62 **** + --- 57,63 ---- + extern "C" int advance(const char *, char *); + extern "C" char *compile(const char *, char *, char *); + #else + + # include + # include + #endif + diff -crN eterm.old/patches/patch-ab eterm/patches/patch-ab *** eterm.old/patches/patch-ab Wed Dec 31 19:00:00 1969 --- eterm/patches/patch-ab Tue Dec 23 16:27:58 1997 *************** *** 0 **** --- 1,19 ---- + *** src/utmp.c.orig Sun Dec 7 21:13:57 1997 + --- src/utmp.c Tue Dec 23 15:56:23 1997 + *************** + *** 188,194 **** + /* local variables */ + /* don't go off end of ut_id & remember if an entry has been made */ + #ifdef UTMP_SUPPORT + ! # ifdef USE_SYSV_UTMP + static char ut_id[5]; /* remember if entry to utmp made */ + # else + static int utmp_pos; /* BSD position of utmp-stamp */ + --- 188,194 ---- + /* local variables */ + /* don't go off end of ut_id & remember if an entry has been made */ + #ifdef UTMP_SUPPORT + ! # if defined(USE_SYSV_UTMP) || defined(__FreeBSD__) + static char ut_id[5]; /* remember if entry to utmp made */ + # else + static int utmp_pos; /* BSD position of utmp-stamp */ diff -crN eterm.old/patches/patch-ac eterm/patches/patch-ac *** eterm.old/patches/patch-ac Wed Dec 31 19:00:00 1969 --- eterm/patches/patch-ac Tue Dec 23 16:40:01 1997 *************** *** 0 **** --- 1,16 ---- + *** autoconf/Makefile.in.orig Sat Oct 25 19:02:24 1997 + --- autoconf/Makefile.in Tue Dec 23 16:38:27 1997 + *************** + *** 18,23 **** + --- 18,28 ---- + all allbin alldoc tags clean: + @for I in ${subdirs}; do (cd $$I; ${MAKE} $@ || exit 1); done + + + FreeBSD: + + @for I in libmej themes doc; do (cd $$I; ${MAKE} all || exit 1)\ + + done + + (cd src; ${MAKE} FreeBSD) + + + # + # entry points for other programs + # diff -crN eterm.old/patches/patch-ad eterm/patches/patch-ad *** eterm.old/patches/patch-ad Wed Dec 31 19:00:00 1969 --- eterm/patches/patch-ad Tue Dec 23 17:16:18 1997 *************** *** 0 **** --- 1,36 ---- + *** autoconf/Make.common.in.orig Fri Dec 5 22:45:11 1997 + --- autoconf/Make.common.in Tue Dec 23 17:14:44 1997 + *************** + *** 25,31 **** + manprefix = + bindir = @bindir@ + mandir = @mandir@/man1 + ! themedir = @prefix@/lib/Eterm/themes + manext = 1 + + # Tools & program stuff + --- 25,31 ---- + manprefix = + bindir = @bindir@ + mandir = @mandir@/man1 + ! themedir = @prefix@/share/Eterm/themes + manext = 1 + + # Tools & program stuff + *************** + *** 45,51 **** + CPPFLAGS = @CPPFLAGS@ -I../libmej -I.. -I${prefix}/include + LDFLAGS = @LDFLAGS@ -L../libmej -L${prefix}/lib + DEFS = @DEFS@ + ! LIBS = @LIBS@ + + # X Include directory + XINC = @X_CFLAGS@ + --- 45,51 ---- + CPPFLAGS = @CPPFLAGS@ -I../libmej -I.. -I${prefix}/include + LDFLAGS = @LDFLAGS@ -L../libmej -L${prefix}/lib + DEFS = @DEFS@ + ! LIBS = @LIBS@ -L/usr/local/lib + + # X Include directory + XINC = @X_CFLAGS@ diff -crN eterm.old/pkg/PLIST eterm/pkg/PLIST *** eterm.old/pkg/PLIST Sun Nov 16 11:32:57 1997 --- eterm/pkg/PLIST Wed Dec 24 23:42:41 1997 *************** *** 1,14 **** bin/Eterm ! bin/dorand ! bin/random_pixmap.sh man/man1/Eterm.1.gz share/Eterm/Eterm.help share/Eterm/Eterm.ref - share/Eterm/Eterm.ti share/Eterm/Eterm.tcap ! share/Eterm/FAQ ! share/Eterm/RELNOTES.Eterm ! share/Eterm/MAIN.dist share/Eterm/colortest.sh ! share/Eterm/menu.sh @dirrm share/Eterm --- 1,31 ---- bin/Eterm ! share/Eterm/themes/Eterm/Eterm.menu ! share/Eterm/themes/Eterm/MAIN ! share/Eterm/themes/Eterm/good-pixmaps.list ! share/Eterm/themes/Eterm/rv-pixmaps.list ! share/Eterm/themes/irc/irc.menu ! share/Eterm/themes/irc/MAIN ! share/Eterm/themes/irc/good-pixmaps.list ! share/Eterm/themes/irc/rv-pixmaps.list ! share/Eterm/themes/mutt/MAIN ! share/Eterm/themes/mutt/good-pixmaps.list ! share/Eterm/themes/mutt/rv-pixmaps.list ! share/Eterm/themes/tn3270/MAIN ! share/Eterm/themes/tn3270/good-pixmaps.list ! share/Eterm/themes/tn3270/rv-pixmaps.list man/man1/Eterm.1.gz + share/Eterm/RELNOTES.Eterm share/Eterm/Eterm.help + share/Eterm/Eterm.menu share/Eterm/Eterm.ref share/Eterm/Eterm.tcap ! share/Eterm/Eterm.ti ! share/Eterm/FAQ.html share/Eterm/colortest.sh ! share/Eterm/menu_cmd ! @dirrm share/Eterm/themes/tn3270 ! @dirrm share/Eterm/themes/mutt ! @dirrm share/Eterm/themes/irc ! @dirrm share/Eterm/themes/Eterm ! @dirrm share/Eterm/themes @dirrm share/Eterm --Multipart_Sat_Dec_27_21:05:02_1997-1--