Date: Mon, 22 Oct 2001 23:26:35 +0200 (CEST) From: Jon Olsson <jon@ape.mine.nu> To: FreeBSD-gnats-submit@freebsd.org Cc: jim@freebsd.org Subject: ports/31437: aterm upgrade from 0.4.0 -> 0.4.2 Message-ID: <20011022212635.A064C12FEC@ape.mine.nu>
next in thread | raw e-mail | index | archive | help
>Number: 31437 >Category: ports >Synopsis: aterm upgrade from 0.4.0 -> 0.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 22 14:30:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Jon Olsson >Release: FreeBSD 4.4-STABLE i386 >Organization: Monkey Mafia ;) >Environment: System: FreeBSD ape.mine.nu 4.4-STABLE FreeBSD 4.4-STABLE #5: Sun Oct 21 16:27:51 CEST 2001 root@ape.mine.nu:/usr/obj/usr/src/sys/APE i386 >Description: aterm version 0.4.2 has been released a few weeks ago. Here's a patch, I've run portlint on it, it works fine. Hope it helps! >How-To-Repeat: >Fix: diff -ruN aterm.orig/Makefile aterm/Makefile --- aterm.orig/Makefile Mon Oct 22 22:36:59 2001 +++ aterm/Makefile Mon Oct 22 22:43:20 2001 @@ -6,7 +6,7 @@ # PORTNAME= aterm -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.2 PORTREVISION= 1 CATEGORIES+= x11 # `+=' is for slave ports MASTER_SITES= http://download.sourceforge.net/aterm/ diff -ruN aterm.orig/distinfo aterm/distinfo --- aterm.orig/distinfo Mon Oct 22 22:36:59 2001 +++ aterm/distinfo Mon Oct 22 23:19:22 2001 @@ -1 +1 @@ -MD5 (aterm-0.4.0.tar.gz) = ae09530c1721681e151a2048146d7fd0 +MD5 (aterm-0.4.2.tar.gz) = d046fcf7fadd661dd5efb393a43c57b1 diff -ruN aterm.orig/files/patch-aa aterm/files/patch-aa --- aterm.orig/files/patch-aa Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-aa Mon Oct 22 23:08:09 2001 @@ -1,6 +1,6 @@ ---- src/command.c.orig Sun May 28 03:46:35 2000 -+++ src/command.c Mon Apr 16 11:34:38 2001 -@@ -67,12 +67,18 @@ +--- src/command.c.orig Mon Oct 22 23:02:47 2001 ++++ src/command.c Mon Oct 22 22:43:26 2001 +@@ -69,12 +69,18 @@ #ifndef NO_XLOCALE # if (XtSpecificationRelease < 6) # define NO_XLOCALE @@ -22,7 +22,7 @@ #ifdef TTY_GID_SUPPORT # include <grp.h> #endif -@@ -528,7 +534,7 @@ +@@ -534,7 +540,7 @@ ttydev = tty_name; # define PTYCHAR1 "pqrstuvwxyz" @@ -31,12 +31,3 @@ for (c1 = PTYCHAR1; *c1; c1++) { ptydev[len - 2] = ttydev[len - 2] = *c1; for (c2 = PTYCHAR2; *c2; c2++) { -@@ -1206,7 +1212,7 @@ - - Input_Context = NULL; - --# ifndef NO_SETLOCALE -+# if !defined(NO_SETLOCALE) || !defined(NO_XSETLOCALE) - setlocale(LC_CTYPE, ""); /* XXX: should we do this? */ - # endif - if (rs_inputMethod == NULL || !*rs_inputMethod) { diff -ruN aterm.orig/files/patch-ab aterm/files/patch-ab --- aterm.orig/files/patch-ab Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,95 +0,0 @@ ---- configure.orig Mon May 29 04:58:49 2000 -+++ configure Mon Apr 16 11:27:07 2001 -@@ -4575,8 +4575,9 @@ - - SAVETHELIBS=$LIBS - LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11" -+CFLAGS="$CFLAGS $X_CFLAGS" - echo $ac_n "checking for working Xlocale""... $ac_c" 1>&6 --echo "configure:4580: checking for working Xlocale" >&5 -+echo "configure:4581: checking for working Xlocale" >&5 - if eval "test \"`echo '$''{'rxvt_cv_func_xlocale'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4584,7 +4585,7 @@ - echo "configure: warning: Define/undefine NO_XLOCALE in config.h manually" 1>&2 - else - cat > conftest.$ac_ext <<EOF --#line 4588 "configure" -+#line 4589 "configure" - #include "confdefs.h" - #define X_LOCALE 1 - #include <X11/Xlocale.h> -@@ -4596,7 +4597,7 @@ - else - exit (1);} - EOF --if { (eval echo configure:4600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./con ftest; exit) 2>/dev/null -+if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./con ftest; exit) 2>/dev/null - then - rxvt_cv_func_xlocale=yes - else -@@ -4620,12 +4621,12 @@ - LIBS=$SAVETHELIBS - - echo $ac_n "checking for working setlocale""... $ac_c" 1>&6 --echo "configure:4624: checking for working setlocale" >&5 -+echo "configure:4625: checking for working setlocale" >&5 - if eval "test \"`echo '$''{'rxvt_cv_func_xsetlocale'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4629 "configure" -+#line 4630 "configure" - #include "confdefs.h" - #define X_LOCALE 1 - #include <X11/Xlocale.h> -@@ -4633,7 +4634,7 @@ - setlocale(LC_CTYPE, ""); - ; return 0; } - EOF --if { (eval echo configure:4637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - rxvt_cv_func_xsetlocale=yes - else -@@ -4647,6 +4648,39 @@ - - echo "$ac_t""$rxvt_cv_func_xsetlocale" 1>&6 - if test "${rxvt_cv_func_xsetlocale}" = no; then -+ cat >> confdefs.h <<\EOF -+#define NO_XSETLOCALE 1 -+EOF -+ -+fi -+ -+echo $ac_n "checking for working plain setlocale""... $ac_c" 1>&6 -+echo "configure:4659: checking for working plain setlocale" >&5 -+if eval "test \"`echo '$''{'rxvt_cv_func_setlocale'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 4664 "configure" -+#include "confdefs.h" -+#include <locale.h> -+int main() { -+setlocale(LC_CTYPE, ""); -+; return 0; } -+EOF -+if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ rxvt_cv_func_setlocale=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ rxvt_cv_func_setlocale=no -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$rxvt_cv_func_setlocale" 1>&6 -+if test x${rxvt_cv_func_setlocale} = xno; then - cat >> confdefs.h <<\EOF - #define NO_SETLOCALE 1 - EOF diff -ruN aterm.orig/files/patch-ac aterm/files/patch-ac --- aterm.orig/files/patch-ac Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- autoconf/acconfig.h.orig Mon May 22 02:56:13 2000 -+++ autoconf/acconfig.h Mon Apr 16 11:27:07 2001 -@@ -39,6 +39,9 @@ - #undef NO_XLOCALE - - /* Define is setlocale (defined to Xsetlocale) doesn't work */ -+#undef NO_XSETLOCALE -+ -+/* Define is plain setlocale doesn't work */ - #undef NO_SETLOCALE - - /* Define if you want Menubar support */ diff -ruN aterm.orig/files/patch-ad aterm/files/patch-ad --- aterm.orig/files/patch-ad Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- autoconf/config.h.in.orig Mon May 22 02:56:13 2000 -+++ autoconf/config.h.in Mon Apr 16 11:27:07 2001 -@@ -84,6 +84,9 @@ - #undef NO_XLOCALE - - /* Define is setlocale (defined to Xsetlocale) doesn't work */ -+#undef NO_XSETLOCALE -+ -+/* Define is plain setlocale doesn't work */ - #undef NO_SETLOCALE - - /* Define if you want Menubar support */ diff -ruN aterm.orig/files/patch-ae aterm/files/patch-ae --- aterm.orig/files/patch-ae Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ ---- autoconf/configure.in.orig Mon May 29 04:58:49 2000 -+++ autoconf/configure.in Mon Apr 16 11:27:07 2001 -@@ -632,6 +632,7 @@ - dnl# this is a really hack test for some basic Xlocale stuff - SAVETHELIBS=$LIBS - LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11" -+CFLAGS="$CFLAGS $X_CFLAGS" - AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, - [AC_TRY_RUN([#define X_LOCALE 1 - #include <X11/Xlocale.h> -@@ -655,6 +656,14 @@ - [setlocale(LC_CTYPE, "");], - rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)]) - if test "${rxvt_cv_func_xsetlocale}" = no; then -+ AC_DEFINE(NO_XSETLOCALE) -+fi -+ -+AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, -+[AC_TRY_LINK([#include <locale.h>], -+ [setlocale(LC_CTYPE, "");], -+ rxvt_cv_func_setlocale=yes, rxvt_cv_func_setlocale=no)]) -+if test x${rxvt_cv_func_setlocale} = xno; then - AC_DEFINE(NO_SETLOCALE) - fi - diff -ruN aterm.orig/files/patch-af aterm/files/patch-af --- aterm.orig/files/patch-af Mon Oct 22 22:36:59 2001 +++ aterm/files/patch-af Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- scripts/random_colors.orig Tue May 16 03:10:57 2000 -+++ scripts/random_colors Mon Apr 16 11:27:07 2001 -@@ -6,7 +6,7 @@ - # folks like it - so here it is - - CLRCODE=`expr $RANDOM % 6` --ATRMPATH=$DESTDIR/usr/local/bin -+ATRMPATH=$DESTDIR/usr/X11R6/bin - - { [ "$CLRCODE" -eq "0" ] && CLRNAME="-tint blue -fg yellow -bg black" } || - { [ "$CLRCODE" -eq "1" ] && CLRNAME="-tint red -fg white -bg black" } || >Release-Note: >Audit-Trail: >Unformatted: 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?20011022212635.A064C12FEC>