ports/100705: [UPDATE] x11-wm/afterstep-stable: Upgrade to 2.2.2
chinsan
chinsan.tw at gmail.com
Sat Jul 22 07:30:14 UTC 2006
>Number: 100705
>Category: ports
>Synopsis: [UPDATE] x11-wm/afterstep-stable: Upgrade to 2.2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 22 07:30:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD BSD6.giga.hgc.com.tw 6.1-STABLE FreeBSD 6.1-STABLE #5: Mon Jul 17 09:30:36 CST 2006 root at BSD6.giga.hgc.com.tw:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Upgrade to 2.2.2
Port maintainer (glewis at FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:
--- afterstep-stable.diff begins here ---
diff -ruN /usr/ports/x11-wm/afterstep-stable/Makefile afterstep-stable/Makefile
--- /usr/ports/x11-wm/afterstep-stable/Makefile Mon Dec 26 21:39:44 2005
+++ afterstep-stable/Makefile Sat Jul 22 15:09:20 2006
@@ -6,12 +6,10 @@
#
PORTNAME= afterstep
-PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTVERSION= 2.2.2
CATEGORIES= x11-wm afterstep
-MASTER_SITES= ftp://ftp.afterstep.org/stable/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
+MASTER_SITE_SUBDIR= stable
DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= glewis at FreeBSD.org
@@ -66,7 +64,7 @@
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
-BROKEN= "Does not build on sparc64"
+BROKEN= Does not build on sparc64
.endif
post-extract:
diff -ruN /usr/ports/x11-wm/afterstep-stable/distinfo afterstep-stable/distinfo
--- /usr/ports/x11-wm/afterstep-stable/distinfo Wed Nov 16 14:05:38 2005
+++ afterstep-stable/distinfo Sat Jul 22 15:06:36 2006
@@ -1,3 +1,3 @@
-MD5 (AfterStep-2.1.2.tar.bz2) = 6e356978680403fcedde547912c4cabf
-SHA256 (AfterStep-2.1.2.tar.bz2) = 76708224628d86823c04753606712415245518b36671fd0c4abc9df9c8dd35b4
-SIZE (AfterStep-2.1.2.tar.bz2) = 5079333
+MD5 (AfterStep-2.2.2.tar.bz2) = dbfe86bfe20c8c377985c7e68232b570
+SHA256 (AfterStep-2.2.2.tar.bz2) = 57657c8374c96aef8a9eeb0aa717aae3a38862bce9c9d389f69378bc8cc9fd65
+SIZE (AfterStep-2.2.2.tar.bz2) = 5458624
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-configure afterstep-stable/files/patch-configure
--- /usr/ports/x11-wm/afterstep-stable/files/patch-configure Sat Jun 11 02:19:07 2005
+++ afterstep-stable/files/patch-configure Sat Jul 22 13:09:16 2006
@@ -1,8 +1,6 @@
-$FreeBSD: ports/x11-wm/afterstep-stable/files/patch-configure,v 1.3 2005/06/10 18:19:07 glewis Exp $
-
---- configure.orig Mon Sep 13 11:43:06 2004
-+++ configure Mon Sep 13 11:43:30 2004
-@@ -1734,7 +1734,7 @@
+--- configure.orig Sat Jul 22 13:08:46 2006
++++ configure Sat Jul 22 13:08:59 2006
+@@ -1811,7 +1811,7 @@
# Check whether --enable-reuse-font or --disable-reuse-font was given.
if test "${enable_reuse_font+set}" = set; then
enableval="$enable_reuse_font"
@@ -11,7 +9,7 @@
cat >>confdefs.h <<\_ACEOF
#define MODULE_REUSE_LOADED_FONT 1
_ACEOF
-@@ -5450,7 +5450,7 @@
+@@ -5830,7 +5830,7 @@
have_shmimage=no
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-configure.h.in afterstep-stable/files/patch-configure.h.in
--- /usr/ports/x11-wm/afterstep-stable/files/patch-configure.h.in Mon Feb 21 05:03:26 2005
+++ afterstep-stable/files/patch-configure.h.in Sat Jul 22 13:12:35 2006
@@ -1,17 +1,15 @@
-$FreeBSD: ports/x11-wm/afterstep-stable/files/patch-configure.h.in,v 1.1 2005/02/20 21:03:26 glewis Exp $
-
-*** configure.h.in.orig Fri Jul 30 23:51:22 2004
---- configure.h.in Fri Jul 30 23:51:27 2004
-***************
-*** 1,10 ****
- #include "config.h"
-
-- #ifdef __FreeBSD__
-- #include <sys/syslimits.h>
-- #else
- #include <limits.h>
-- #endif
-
- /* we don't do interhost network communications ! WE use Unix domain sockets! */
- #define SAME_HOST
---- 1,6 ----
+--- configure.h.in.orig Sat Jul 22 13:11:57 2006
++++ configure.h.in Sat Jul 22 13:12:18 2006
+@@ -2,12 +2,7 @@
+
+ #define AFTERSTEP_INTERNALS
+
+-#ifdef __FreeBSD__
+-#include <sys/cdefs.h>
+-#include <sys/syslimits.h>
+-#else
+ #include <limits.h>
+-#endif
+
+ /* we don't do interhost network communications ! WE use Unix domain sockets! */
+ #define SAME_HOST
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-libAfterBase-audit.c afterstep-stable/files/patch-libAfterBase-audit.c
--- /usr/ports/x11-wm/afterstep-stable/files/patch-libAfterBase-audit.c Thu Jan 1 08:00:00 1970
+++ afterstep-stable/files/patch-libAfterBase-audit.c Sat Jul 22 11:30:50 2006
@@ -0,0 +1,59 @@
+--- libAfterBase/audit.c.orig Sat Sep 25 03:45:27 2004
++++ libAfterBase/audit.c Wed Sep 29 15:36:51 2004
+@@ -498,7 +498,7 @@
+ #else
+ /*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/
+ safefree (m->ptr);
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+ #endif
+ }
+
+@@ -817,7 +817,7 @@
+ */
+
+ XFreePixmap (display, pmap);
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+ return Success;
+ }
+
+@@ -852,7 +852,7 @@
+ }
+
+ XFreeGC (display, gc);
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+ return Success;
+ }
+
+@@ -931,17 +931,17 @@
+ /* can also be of C_MEM type if we allocated it ourselvs */
+ m = count_find_and_extract (fname, line, (void *)image, C_MEM);
+ if (m)
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+
+ /* find and free the image->data pointer if it is in our list */
+ if( image_data )
+ if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL)
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+
+ /* find and free the image->obdata pointer if it is in our list */
+ if( image_obdata )
+ if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL)
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+
+ return Success;
+ }
+@@ -1140,7 +1140,7 @@
+ }
+
+ XFree (data);
+- mem_destroy( (ASHashableValue)NULL, m );
++ mem_destroy( (ASHashableValue)(void*)NULL, m );
+ return Success;
+ }
+
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c afterstep-stable/files/patch-libAfterBase::audit.c
--- /usr/ports/x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c Wed Oct 13 18:20:10 2004
+++ afterstep-stable/files/patch-libAfterBase::audit.c Thu Jan 1 08:00:00 1970
@@ -1,59 +0,0 @@
---- libAfterBase/audit.c.orig Sat Sep 25 03:45:27 2004
-+++ libAfterBase/audit.c Wed Sep 29 15:36:51 2004
-@@ -498,7 +498,7 @@
- #else
- /*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/
- safefree (m->ptr);
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
- #endif
- }
-
-@@ -817,7 +817,7 @@
- */
-
- XFreePixmap (display, pmap);
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
- return Success;
- }
-
-@@ -852,7 +852,7 @@
- }
-
- XFreeGC (display, gc);
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
- return Success;
- }
-
-@@ -931,17 +931,17 @@
- /* can also be of C_MEM type if we allocated it ourselvs */
- m = count_find_and_extract (fname, line, (void *)image, C_MEM);
- if (m)
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
-
- /* find and free the image->data pointer if it is in our list */
- if( image_data )
- if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL)
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
-
- /* find and free the image->obdata pointer if it is in our list */
- if( image_obdata )
- if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL)
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
-
- return Success;
- }
-@@ -1140,7 +1140,7 @@
- }
-
- XFree (data);
-- mem_destroy( (ASHashableValue)NULL, m );
-+ mem_destroy( (ASHashableValue)(void*)NULL, m );
- return Success;
- }
-
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-src-ASDocGen-Makefile.in afterstep-stable/files/patch-src-ASDocGen-Makefile.in
--- /usr/ports/x11-wm/afterstep-stable/files/patch-src-ASDocGen-Makefile.in Thu Jan 1 08:00:00 1970
+++ afterstep-stable/files/patch-src-ASDocGen-Makefile.in Sat Jul 22 13:25:37 2006
@@ -0,0 +1,16 @@
+--- src/ASDocGen/Makefile.in.orig Sat Jul 22 13:24:32 2006
++++ src/ASDocGen/Makefile.in Sat Jul 22 13:24:57 2006
+@@ -56,13 +56,6 @@
+ echo -n "$$f "; \
+ $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
+ done; echo "Done"; \
+- cd API; echo "Installing API man pages using command - " ; \
+- echo " \"$(INSTALL_DATA) <name>.man $(AFTER_MAN_API_DIR)/html/<name>.3x\""; \
+- for f in `ls *.man`; do \
+- page_name=`echo $$f| awk -F . '{print $$1}'`; \
+- echo -n "$$f "; \
+- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
+- done; echo "Done"; \
+ cd ../..
+
+ install.data_html: do_compile
diff -ruN /usr/ports/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in afterstep-stable/files/patch-src::ASDocGen::Makefile.in
--- /usr/ports/x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in Wed Oct 13 18:20:10 2004
+++ afterstep-stable/files/patch-src::ASDocGen::Makefile.in Thu Jan 1 08:00:00 1970
@@ -1,21 +0,0 @@
---- src/ASDocGen/Makefile.in.orig Wed Sep 15 07:55:46 2004
-+++ src/ASDocGen/Makefile.in Wed Sep 29 18:17:40 2004
-@@ -43,12 +43,12 @@
- echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
- done; echo "Done"; \
-- cd API; echo "Installing API man pages ..." ; \
-- for f in `ls *.man`; do \
-- page_name=`echo $$f| awk -F . '{print $$1}'`; \
-- echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
-- $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
-- done; echo "Done"; \
-+# cd API; echo "Installing API man pages ..." ; \
-+# for f in `ls *.man`; do \
-+# page_name=`echo $$f| awk -F . '{print $$1}'`; \
-+# echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
-+# $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
-+# done; echo "Done"; \
- cd ../..
-
- install.data_html: do_compile
--- afterstep-stable.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list