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

(-)afterstep-stable/Makefile (-6 / +4 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	afterstep
8
PORTNAME=	afterstep
9
PORTVERSION=	2.1.2
9
PORTVERSION=	2.2.2
10
PORTREVISION=	1
11
CATEGORIES=	x11-wm afterstep
10
CATEGORIES=	x11-wm afterstep
12
MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
11
MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
13
		${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	stable
14
MASTER_SITE_SUBDIR=	${PORTNAME}
15
DISTNAME=	AfterStep-${PORTVERSION}
13
DISTNAME=	AfterStep-${PORTVERSION}
16
14
17
MAINTAINER=	glewis@FreeBSD.org
15
MAINTAINER=	glewis@FreeBSD.org
Lines 66-72 Link Here
66
.include <bsd.port.pre.mk>
64
.include <bsd.port.pre.mk>
67
65
68
.if ${ARCH} == "sparc64"
66
.if ${ARCH} == "sparc64"
69
BROKEN=		"Does not build on sparc64"
67
BROKEN=		Does not build on sparc64
70
.endif
68
.endif
71
69
72
post-extract:
70
post-extract:
(-)afterstep-stable/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (AfterStep-2.1.2.tar.bz2) = 6e356978680403fcedde547912c4cabf
1
MD5 (AfterStep-2.2.2.tar.bz2) = dbfe86bfe20c8c377985c7e68232b570
2
SHA256 (AfterStep-2.1.2.tar.bz2) = 76708224628d86823c04753606712415245518b36671fd0c4abc9df9c8dd35b4
2
SHA256 (AfterStep-2.2.2.tar.bz2) = 57657c8374c96aef8a9eeb0aa717aae3a38862bce9c9d389f69378bc8cc9fd65
3
SIZE (AfterStep-2.1.2.tar.bz2) = 5079333
3
SIZE (AfterStep-2.2.2.tar.bz2) = 5458624
(-)afterstep-stable/files/patch-configure (-6 / +4 lines)
Lines 1-8 Link Here
1
$FreeBSD: ports/x11-wm/afterstep-stable/files/patch-configure,v 1.3 2005/06/10 18:19:07 glewis Exp $
1
--- configure.orig	Sat Jul 22 13:08:46 2006
2
2
+++ configure	Sat Jul 22 13:08:59 2006
3
--- configure.orig	Mon Sep 13 11:43:06 2004
3
@@ -1811,7 +1811,7 @@
4
+++ configure	Mon Sep 13 11:43:30 2004
5
@@ -1734,7 +1734,7 @@
6
 # Check whether --enable-reuse-font or --disable-reuse-font was given.
4
 # Check whether --enable-reuse-font or --disable-reuse-font was given.
7
 if test "${enable_reuse_font+set}" = set; then
5
 if test "${enable_reuse_font+set}" = set; then
8
   enableval="$enable_reuse_font"
6
   enableval="$enable_reuse_font"
Lines 11-17 Link Here
11
 cat >>confdefs.h <<\_ACEOF
9
 cat >>confdefs.h <<\_ACEOF
12
 #define MODULE_REUSE_LOADED_FONT 1
10
 #define MODULE_REUSE_LOADED_FONT 1
13
 _ACEOF
11
 _ACEOF
14
@@ -5450,7 +5450,7 @@
12
@@ -5830,7 +5830,7 @@
15
 
13
 
16
 have_shmimage=no
14
 have_shmimage=no
17
 
15
 
(-)afterstep-stable/files/patch-configure.h.in (-17 / +15 lines)
Lines 1-17 Link Here
1
$FreeBSD: ports/x11-wm/afterstep-stable/files/patch-configure.h.in,v 1.1 2005/02/20 21:03:26 glewis Exp $
1
--- configure.h.in.orig	Sat Jul 22 13:11:57 2006
2
2
+++ configure.h.in	Sat Jul 22 13:12:18 2006
3
*** configure.h.in.orig	Fri Jul 30 23:51:22 2004
3
@@ -2,12 +2,7 @@
4
--- configure.h.in	Fri Jul 30 23:51:27 2004
4
 
5
***************
5
 #define AFTERSTEP_INTERNALS
6
*** 1,10 ****
6
 
7
  #include "config.h"
7
-#ifdef __FreeBSD__
8
  
8
-#include <sys/cdefs.h>
9
- #ifdef __FreeBSD__
9
-#include <sys/syslimits.h>
10
- #include <sys/syslimits.h>
10
-#else
11
- #else
11
 #include <limits.h>
12
  #include <limits.h>
12
-#endif
13
- #endif
13
 
14
  
14
 /* we don't do interhost network communications ! WE use Unix domain sockets! */
15
  /* we don't do interhost network communications ! WE use Unix domain sockets! */
15
 #define SAME_HOST
16
  #define SAME_HOST
17
--- 1,6 ----
(-)afterstep-stable/files/patch-libAfterBase-audit.c (+59 lines)
Line 0 Link Here
1
--- libAfterBase/audit.c.orig	Sat Sep 25 03:45:27 2004
2
+++ libAfterBase/audit.c	Wed Sep 29 15:36:51 2004
3
@@ -498,7 +498,7 @@
4
 #else
5
 	/*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/
6
 	safefree (m->ptr);
7
-	mem_destroy( (ASHashableValue)NULL, m );
8
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
9
 #endif
10
 }
11
 
12
@@ -817,7 +817,7 @@
13
 */
14
 
15
 	XFreePixmap (display, pmap);
16
-	mem_destroy( (ASHashableValue)NULL, m );
17
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
18
 	return Success;
19
 }
20
 
21
@@ -852,7 +852,7 @@
22
 	}
23
 
24
 	XFreeGC (display, gc);
25
-	mem_destroy( (ASHashableValue)NULL, m );
26
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
27
 	return Success;
28
 }
29
 
30
@@ -931,17 +931,17 @@
31
 		/* can also be of C_MEM type if we allocated it ourselvs */
32
 		m = count_find_and_extract (fname, line, (void *)image, C_MEM);
33
 	if (m)
34
-		mem_destroy( (ASHashableValue)NULL, m );
35
+		mem_destroy( (ASHashableValue)(void*)NULL, m );
36
 
37
 	/* find and free the image->data pointer if it is in our list */
38
 	if( image_data )
39
 		if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL)
40
-			mem_destroy( (ASHashableValue)NULL, m );
41
+			mem_destroy( (ASHashableValue)(void*)NULL, m );
42
 
43
 	/* find and free the image->obdata pointer if it is in our list */
44
 	if( image_obdata )
45
 		if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL)
46
-			mem_destroy( (ASHashableValue)NULL, m );
47
+			mem_destroy( (ASHashableValue)(void*)NULL, m );
48
 
49
 	return Success;
50
 }
51
@@ -1140,7 +1140,7 @@
52
 	}
53
 
54
 	XFree (data);
55
-	mem_destroy( (ASHashableValue)NULL, m );
56
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
57
 	return Success;
58
 }
59
 
(-)afterstep-stable/files/patch-libAfterBase::audit.c (-59 lines)
Lines 1-59 Link Here
1
--- libAfterBase/audit.c.orig	Sat Sep 25 03:45:27 2004
2
+++ libAfterBase/audit.c	Wed Sep 29 15:36:51 2004
3
@@ -498,7 +498,7 @@
4
 #else
5
 	/*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/
6
 	safefree (m->ptr);
7
-	mem_destroy( (ASHashableValue)NULL, m );
8
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
9
 #endif
10
 }
11
 
12
@@ -817,7 +817,7 @@
13
 */
14
 
15
 	XFreePixmap (display, pmap);
16
-	mem_destroy( (ASHashableValue)NULL, m );
17
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
18
 	return Success;
19
 }
20
 
21
@@ -852,7 +852,7 @@
22
 	}
23
 
24
 	XFreeGC (display, gc);
25
-	mem_destroy( (ASHashableValue)NULL, m );
26
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
27
 	return Success;
28
 }
29
 
30
@@ -931,17 +931,17 @@
31
 		/* can also be of C_MEM type if we allocated it ourselvs */
32
 		m = count_find_and_extract (fname, line, (void *)image, C_MEM);
33
 	if (m)
34
-		mem_destroy( (ASHashableValue)NULL, m );
35
+		mem_destroy( (ASHashableValue)(void*)NULL, m );
36
 
37
 	/* find and free the image->data pointer if it is in our list */
38
 	if( image_data )
39
 		if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL)
40
-			mem_destroy( (ASHashableValue)NULL, m );
41
+			mem_destroy( (ASHashableValue)(void*)NULL, m );
42
 
43
 	/* find and free the image->obdata pointer if it is in our list */
44
 	if( image_obdata )
45
 		if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL)
46
-			mem_destroy( (ASHashableValue)NULL, m );
47
+			mem_destroy( (ASHashableValue)(void*)NULL, m );
48
 
49
 	return Success;
50
 }
51
@@ -1140,7 +1140,7 @@
52
 	}
53
 
54
 	XFree (data);
55
-	mem_destroy( (ASHashableValue)NULL, m );
56
+	mem_destroy( (ASHashableValue)(void*)NULL, m );
57
 	return Success;
58
 }
59
 
(-)afterstep-stable/files/patch-src-ASDocGen-Makefile.in (+16 lines)
Line 0 Link Here
1
--- src/ASDocGen/Makefile.in.orig	Sat Jul 22 13:24:32 2006
2
+++ src/ASDocGen/Makefile.in	Sat Jul 22 13:24:57 2006
3
@@ -56,13 +56,6 @@
4
 	  		echo -n "$$f "; \
5
 	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
6
 		done; echo "Done"; \
7
-		cd API; echo "Installing API man pages using command - " ; \
8
-		echo "    \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/html/<name>.3x\""; \
9
-		for f in `ls *.man`; do \
10
-			page_name=`echo $$f| awk -F . '{print $$1}'`; \
11
-	  		echo -n "$$f "; \
12
-	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
13
-		done; echo "Done"; \
14
 		cd ../..
15
 
16
 install.data_html:  do_compile
(-)afterstep-stable/files/patch-src::ASDocGen::Makefile.in (-21 lines)
Lines 1-21 Link Here
1
--- src/ASDocGen/Makefile.in.orig	Wed Sep 15 07:55:46 2004
2
+++ src/ASDocGen/Makefile.in	Wed Sep 29 18:17:40 2004
3
@@ -43,12 +43,12 @@
4
 	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
5
 	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
6
 		done; echo "Done"; \
7
-		cd API; echo "Installing API man pages ..." ; \
8
-		for f in `ls *.man`; do \
9
-			page_name=`echo $$f| awk -F . '{print $$1}'`; \
10
-	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
11
-	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
12
-		done; echo "Done"; \
13
+#		cd API; echo "Installing API man pages ..." ; \
14
+#		for f in `ls *.man`; do \
15
+#			page_name=`echo $$f| awk -F . '{print $$1}'`; \
16
+#	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
17
+#	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
18
+#		done; echo "Done"; \
19
 		cd ../..
20
 
21
 install.data_html:  do_compile

Return to bug 100705