Date: Thu, 25 Jun 1998 18:00:42 -0600 (MDT) From: brett@peloton.physics.montana.edu To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/7072: update of afterstep144 port Message-ID: <199806260000.SAA25484@peloton.physics.montana.edu>
next in thread | raw e-mail | index | archive | help
>Number: 7072
>Category: ports
>Synopsis: update of afterstep144 port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 25 17:10:01 PDT 1998
>Last-Modified:
>Originator: Brett Taylor
>Organization:
Montana State University, Bozeman
>Release: FreeBSD 2.2.6-STABLE i386
>Environment:
FreeBSD 2.2.6-STABLE #0: Wed Jun 17 11:08:32 MDT 1998
>Description:
update of afterstep144 port:
- AS is now packageable (pkg_add can handle weird chars now)
so NO_PACKAGE removed
- stole some asmodem patches from a pending PR by Sean Cole
for a separate asmodem port (thanks Sean) so now asmodem
is made w/ AS
- update PLIST to recognize this
- removed scripts directory (it's empty - I thought I said to
do this before, but it's still there
- can we PLEASE PLEASE PLEASE change the name of the port to
something that actually reflects the version! The port
builds AS-1.4.5.3 and the port is named afterstep144!
AS-1.5 is in pre-release now and I believe that it will be
able to replace the 1.0 port so maybe this isn't so big a
deal, but it's a bit annoying. As it is, you can make
1.4.5.3 use old .steprc files so maybe it can replace the
1.0 port right now. -shrug-
>How-To-Repeat:
apply diff below
>Fix:
diff -ruN afterstep144/Makefile afterstep-devel/Makefile
--- afterstep144/Makefile Wed Jun 24 16:28:58 1998
+++ afterstep-devel/Makefile Thu Jun 25 17:38:43 1998
@@ -20,10 +20,6 @@
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-#NO_PACKAGE= yes
-#there are 130 files or so with spaces or parens in their name which
-#makes pkg_add die so we can't easily package this
-
WRKSRC= ${WRKDIR}/AfterStep
IS_INTERACTIVE= yes
diff -ruN afterstep144/patches/patch-ae afterstep-devel/patches/patch-ae
--- afterstep144/patches/patch-ae Sun May 17 21:24:08 1998
+++ afterstep-devel/patches/patch-ae Thu Jun 25 17:29:24 1998
@@ -1,5 +1,5 @@
-*** Imakefile Sun May 10 11:54:54 1998
---- Imakefile Sun May 10 11:55:46 1998
+*** Imakefile.orig Thu Jun 25 17:23:03 1998
+--- Imakefile Thu Jun 25 17:24:18 1998
***************
*** 17,28 ****
afterdoc \
@@ -8,13 +8,21 @@
- apps/asfsm \
- apps/asload \
apps/asmail \
-- apps/asmix \
-- apps/asmixer \
-- apps/asprint \
+! apps/asmix \
+! apps/asmixer \
+! apps/asprint \
+ apps/xiterm/src \
+ modules/ASSound \
+ modules/Animate \
+--- 17,24 ----
+ afterdoc \
+ apps/ascd \
+ apps/asclock \
+ apps/asmail \
+! apps/asmodem \
apps/xiterm/src \
modules/ASSound \
modules/Animate \
---- 17,23 ----
***************
*** 43,52 ****
MakeSubdirs($(SUBDIRS))
@@ -27,7 +35,7 @@
mrproper::
rm -fr config.cache config.log config.status Makefile.bak *.orig
---- 38,47 ----
+--- 39,48 ----
MakeSubdirs($(SUBDIRS))
install::
diff -ruN afterstep144/patches/patch-am afterstep-devel/patches/patch-am
--- afterstep144/patches/patch-am Wed Dec 31 17:00:00 1969
+++ afterstep-devel/patches/patch-am Thu Jun 25 17:18:06 1998
@@ -0,0 +1,114 @@
+--- apps/asmodem/asmodem.c Mon May 11 15:38:04 1998
++++ apps/asmodem/asmodem.c Mon May 11 15:58:52 1998
+@@ -22,8 +22,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <net/if.h>
+-#include <linux/ppp_defs.h>
+-
++#include <net/if_ppp.h>
+
+ /* XPM struct and icons ******************************************************/
+ typedef struct _XpmIcon {
+@@ -58,7 +57,7 @@
+ #define DEFINTERVAL 3 /* Default interval 2 sec */
+ #define TRUE 1;
+ #define FALSE 0;
+-#define DEFAULTMODEM "/var/lock/LCK..modem"
++#define DEFAULTMODEM "/var/run/cuaa1.if"
+
+ int withdrawn= FALSE;
+ Display *Disp;
+@@ -109,8 +108,8 @@
+ fprintf(stderr,"options:\n");
+ fprintf(stderr," -w withdrawn mode (For WindowMaker's Dock)\n");
+ fprintf(stderr," -s transparent edge mode\n");
+- fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..cua1) \n");
+- fprintf(stderr," default is /var/lock/LCK..modem (/dev/modem) \n");
++ fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..modem) \n");
++ fprintf(stderr," default is /var/run/cuaa1.if \n");
+ fprintf(stderr," -u <sec> update frequency (default 5 sec)\n");
+ fprintf(stderr," -p [+|-]x[+|-]y position of asmodem\n");
+ fprintf(stderr," -d <program> program to execute on click while disconnected (dial?)\n");
+@@ -293,7 +292,7 @@
+ {
+ XEvent Event;
+ XpmIcon Prev;
+- struct ifreq ifreq;
++ struct ifpppstatsreq ifreq;
+ struct ppp_stats stats;
+ int rb, tb;
+
+@@ -309,13 +308,14 @@
+ }
+ //fprintf(stderr, "x ");
+ if (CarrierOn) {
+- memset(&ifreq, 0, sizeof(ifreq));
+- strcpy(ifreq.ifr_ifrn.ifrn_name, "ppp0");
+- ifreq.ifr_ifru.ifru_data = (caddr_t)&stats;
+- if ((ioctl(sock,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0)){
++ memset(&ifreq, 0, sizeof(ifreq));
++
++ strcpy(ifreq.ifr_name, "ppp0");
++ if ((ioctl(sock,SIOCGPPPSTATS,&ifreq) < 0)){
+ fprintf(stderr, "asmodem: ioctl f*cked\n");
+ prb = ptb = 0;
+ } else {
++ stats = ifreq.stats;
+ rb = stats.p.ppp_ibytes;
+ tb = stats.p.ppp_obytes;
+ if (rb > prb) {
+@@ -398,14 +398,14 @@
+ /****************************************************************************/
+ int IsNewMail(char *Mbox)
+ {
++
+ FILE* MailFile;
+ int Ret = 0;
+ char Buffer[30] = "";
+ int WasStatus = 1;
+ int NewMailn = 0;
+
+- MailFile = fopen(Mbox, "r");
+-
++/* MailFile = fopen(Mbox, "r");
+ while(!feof(MailFile))
+ {
+ fgets(Buffer, 29, MailFile);
+@@ -420,6 +420,8 @@
+ fclose(MailFile);
+
+ return (NewMailn||!WasStatus);
++*/
++ return 0;
+ }
+
+ /****************************************************************************/
+@@ -427,8 +429,9 @@
+ {
+ FILE* MailFile = 0;
+ int Ret = 0;
++
++/* MailFile = fopen(Mbox, "r");
+
+- MailFile = fopen(Mbox, "r");
+ if(MailFile == 0)
+ Ret = 0;
+ else
+@@ -441,7 +444,15 @@
+ }
+ fclose(MailFile);
+
+- return Ret;
++ return Ret;
++*/
++
++ if ((MailFile=fopen(Mbox,"r"))==NULL)
++ return 0;
++ else {
++ fclose(MailFile);
++ return 1;
++ }
+ }
+
+ /****************************************************************************/
diff -ruN afterstep144/patches/patch-an afterstep-devel/patches/patch-an
--- afterstep144/patches/patch-an Wed Dec 31 17:00:00 1969
+++ afterstep-devel/patches/patch-an Thu Jun 25 17:17:25 1998
@@ -0,0 +1,25 @@
+*** apps/asmodem/asmodem.man.orig Thu Mar 26 05:25:41 1998
+--- apps/asmodem/asmodem.man Thu Jun 25 17:16:32 1998
+***************
+*** 1,4 ****
+! .TH asmodem 0.6 "19 Jul 1997" asmodem
+ .UC
+ .SH NAME
+ \fBasmodem\fP \- AfterStep Modem
+--- 1,4 ----
+! .TH asmodem 0.6 "15 Sept 1996" asmail
+ .UC
+ .SH NAME
+ \fBasmodem\fP \- AfterStep Modem
+***************
+*** 98,100 ****
+--- 98,106 ----
+ asmodem: http://www.cs.hope.edu/~malda/
+ .RE
+ asmail:http://www.rby.hk-r.se/~pt95pli/
++ .RE
++ afterstep:http://www.afterstep.org/
++ .SH FREEBSD PORT
++ Note that the FreeBSD port uses /var/run/cuaa1.if as its default lockfile and the names of the serial devices (modems) are spelled with two aa's (e.g. /dev/cuaa1 ).
++
++ Modified May 1998 for FreeBSD.
diff -ruN afterstep144/pkg/PLIST afterstep-devel/pkg/PLIST
--- afterstep144/pkg/PLIST Fri May 22 11:57:36 1998
+++ afterstep-devel/pkg/PLIST Thu Jun 25 17:39:12 1998
@@ -2,6 +2,7 @@
bin/afterstep
bin/asclock
bin/asmail
+bin/asmodem
bin/xiterm
bin/ASSound
bin/Animate
@@ -33,6 +34,7 @@
man/man1/Auto.1.gz
man/man1/asclock.1.gz
man/man1/asmail.1.gz
+man/man1/asmodem.1.gz
man/man1/xiterm.1.gz
man/man1/Clean.1.gz
man/man1/ASSound.1.gz
>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?199806260000.SAA25484>