Attachment #2230 for bug #7072

View | Details | Raw Unified | Return to bug 7072
Collapse All | Expand All

Lines 20-29 Link Here

(-)afterstep-devel/Makefile (-4 lines)
20		20
21	LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm	21	LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
22		22
23	#NO_PACKAGE= yes
24	#there are 130 files or so with spaces or parens in their name which
25	#makes pkg_add die so we can't easily package this
26
27	WRKSRC= ${WRKDIR}/AfterStep	23	WRKSRC= ${WRKDIR}/AfterStep
28		24
29	IS_INTERACTIVE= yes	25	IS_INTERACTIVE= yes




*** Imakefile.orig	Thu Jun 25 17:23:03 1998
--- Imakefile	Thu Jun 25 17:24:18 1998
***************
*** 17,28 ****
  	afterdoc \

- 	apps/asfsm \
- 	apps/asload \
  	apps/asmail \
! 	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))

  
  mrproper::
  	rm -fr config.cache config.log config.status Makefile.bak *.orig
--- 39,48 ----
  MakeSubdirs($(SUBDIRS))
  
  install::




--- 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;
+	}   
 }
 
 /****************************************************************************/




*** 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.

Lines 2-7 Link Here

(-)afterstep-devel/pkg/PLIST (+2 lines)
2	bin/afterstep	2	bin/afterstep
3	bin/asclock	3	bin/asclock
4	bin/asmail	4	bin/asmail
		5	bin/asmodem
5	bin/xiterm	6	bin/xiterm
6	bin/ASSound	7	bin/ASSound
7	bin/Animate	8	bin/Animate
Lines 33-38 Link Here
33	man/man1/Auto.1.gz	34	man/man1/Auto.1.gz
34	man/man1/asclock.1.gz	35	man/man1/asclock.1.gz
35	man/man1/asmail.1.gz	36	man/man1/asmail.1.gz
		37	man/man1/asmodem.1.gz
36	man/man1/xiterm.1.gz	38	man/man1/xiterm.1.gz
37	man/man1/Clean.1.gz	39	man/man1/Clean.1.gz
38	man/man1/ASSound.1.gz	40	man/man1/ASSound.1.gz

Return to bug 7072

Lines 1-5 Link Here

(-)afterstep-devel/patches/patch-ae (-7 / +15 lines)
1	*** Imakefile Sun May 10 11:54:54 1998	1	*** Imakefile.orig Thu Jun 25 17:23:03 1998
2	--- Imakefile Sun May 10 11:55:46 1998	2	--- Imakefile Thu Jun 25 17:24:18 1998
3	***************	3	***************
4	* 17,28 **	4	* 17,28 **
5	afterdoc \	5	afterdoc \
Lines 8-20 Link Here
8	- apps/asfsm \	8	- apps/asfsm \
9	- apps/asload \	9	- apps/asload \
10	apps/asmail \	10	apps/asmail \
11	- apps/asmix \	11	! apps/asmix \
12	- apps/asmixer \	12	! apps/asmixer \
13	- apps/asprint \	13	! apps/asprint \
		14	apps/xiterm/src \
		15	modules/ASSound \
		16	modules/Animate \
		17	--- 17,24 ----
		18	afterdoc \
		19	apps/ascd \
		20	apps/asclock \
		21	apps/asmail \
		22	! apps/asmodem \
14	apps/xiterm/src \	23	apps/xiterm/src \
15	modules/ASSound \	24	modules/ASSound \
16	modules/Animate \	25	modules/Animate \
17	--- 17,23 ----
18	***************	26	***************
19	* 43,52 **	27	* 43,52 **
20	MakeSubdirs($(SUBDIRS))	28	MakeSubdirs($(SUBDIRS))
Lines 27-33 Link Here
27		35
28	mrproper::	36	mrproper::
29	rm -fr config.cache config.log config.status Makefile.bak *.orig	37	rm -fr config.cache config.log config.status Makefile.bak *.orig
30	--- 38,47 ----	38	--- 39,48 ----
31	MakeSubdirs($(SUBDIRS))	39	MakeSubdirs($(SUBDIRS))
32		40
33	install::	41	install::

Line 0 Link Here

(-)afterstep-devel/patches/patch-am (+114 lines)
		1	--- apps/asmodem/asmodem.c Mon May 11 15:38:04 1998
		2	+++ apps/asmodem/asmodem.c Mon May 11 15:58:52 1998
		3	@@ -22,8 +22,7 @@
		4	#include <sys/ioctl.h>
		5	#include <sys/socket.h>
		6	#include <net/if.h>
		7	-#include <linux/ppp_defs.h>
		8	-
		9	+#include <net/if_ppp.h>
		10
		11	/* XPM struct and icons ******************************************************/
		12	typedef struct _XpmIcon {
		13	@@ -58,7 +57,7 @@
		14	#define DEFINTERVAL 3 /* Default interval 2 sec */
		15	#define TRUE 1;
		16	#define FALSE 0;
		17	-#define DEFAULTMODEM "/var/lock/LCK..modem"
		18	+#define DEFAULTMODEM "/var/run/cuaa1.if"
		19
		20	int withdrawn= FALSE;
		21	Display *Disp;
		22	@@ -109,8 +108,8 @@
		23	fprintf(stderr,"options:\n");
		24	fprintf(stderr," -w withdrawn mode (For WindowMaker's Dock)\n");
		25	fprintf(stderr," -s transparent edge mode\n");
		26	- fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..cua1) \n");
		27	- fprintf(stderr," default is /var/lock/LCK..modem (/dev/modem) \n");
		28	+ fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..modem) \n");
		29	+ fprintf(stderr," default is /var/run/cuaa1.if \n");
		30	fprintf(stderr," -u <sec> update frequency (default 5 sec)\n");
		31	fprintf(stderr," -p [+\|-]x[+\|-]y position of asmodem\n");
		32	fprintf(stderr," -d <program> program to execute on click while disconnected (dial?)\n");
		33	@@ -293,7 +292,7 @@
		34	{
		35	XEvent Event;
		36	XpmIcon Prev;
		37	- struct ifreq ifreq;
		38	+ struct ifpppstatsreq ifreq;
		39	struct ppp_stats stats;
		40	int rb, tb;
		41
		42	@@ -309,13 +308,14 @@
		43	}
		44	//fprintf(stderr, "x ");
		45	if (CarrierOn) {
		46	- memset(&ifreq, 0, sizeof(ifreq));
		47	- strcpy(ifreq.ifr_ifrn.ifrn_name, "ppp0");
		48	- ifreq.ifr_ifru.ifru_data = (caddr_t)&stats;
		49	- if ((ioctl(sock,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0)){
		50	+ memset(&ifreq, 0, sizeof(ifreq));
		51	+
		52	+ strcpy(ifreq.ifr_name, "ppp0");
		53	+ if ((ioctl(sock,SIOCGPPPSTATS,&ifreq) < 0)){
		54	fprintf(stderr, "asmodem: ioctl f*cked\n");
		55	prb = ptb = 0;
		56	} else {
		57	+ stats = ifreq.stats;
		58	rb = stats.p.ppp_ibytes;
		59	tb = stats.p.ppp_obytes;
		60	if (rb > prb) {
		61	@@ -398,14 +398,14 @@
		62	/****************************************************************************/
		63	int IsNewMail(char *Mbox)
		64	{
65	+
66	FILE* MailFile;
67	int Ret = 0;
68	char Buffer[30] = "";
69	int WasStatus = 1;
70	int NewMailn = 0;
71
72	- MailFile = fopen(Mbox, "r");
73	-
74	+/* MailFile = fopen(Mbox, "r");
75	while(!feof(MailFile))
76	{
77	fgets(Buffer, 29, MailFile);
78	@@ -420,6 +420,8 @@
79	fclose(MailFile);
80
81	return (NewMailn\|\|!WasStatus);
82	+*/
83	+ return 0;
84	}
85
86	/****************************************************************************/
87	@@ -427,8 +429,9 @@
88	{
89	FILE* MailFile = 0;
90	int Ret = 0;
91	+
92	+/* MailFile = fopen(Mbox, "r");
93
94	- MailFile = fopen(Mbox, "r");
95	if(MailFile == 0)
96	Ret = 0;
97	else
98	@@ -441,7 +444,15 @@
99	}
100	fclose(MailFile);
101
102	- return Ret;
103	+ return Ret;
104	+*/
105	+
106	+ if ((MailFile=fopen(Mbox,"r"))==NULL)
107	+ return 0;
108	+ else {
109	+ fclose(MailFile);
110	+ return 1;
111	+ }
112	}
113
114	/****************************************************************************/

Line 0 Link Here

(-)afterstep-devel/patches/patch-an (+25 lines)
	1	*** apps/asmodem/asmodem.man.orig Thu Mar 26 05:25:41 1998
	2	--- apps/asmodem/asmodem.man Thu Jun 25 17:16:32 1998
	3	***************
	4	* 1,4 **
	5	! .TH asmodem 0.6 "19 Jul 1997" asmodem
	6	.UC
	7	.SH NAME
	8	\fBasmodem\fP \- AfterStep Modem
	9	--- 1,4 ----
	10	! .TH asmodem 0.6 "15 Sept 1996" asmail
	11	.UC
	12	.SH NAME
	13	\fBasmodem\fP \- AfterStep Modem
	14	***************
	15	* 98,100 **
	16	--- 98,106 ----
	17	asmodem: http://www.cs.hope.edu/~malda/
	18	.RE
	19	asmail:http://www.rby.hk-r.se/~pt95pli/
	20	+ .RE
	21	+ afterstep:http://www.afterstep.org/
	22	+ .SH FREEBSD PORT
	23	+ 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 ).
	24	+
	25	+ Modified May 1998 for FreeBSD.