diff options
author | glewis <glewis@FreeBSD.org> | 2009-08-24 04:57:57 +0800 |
---|---|---|
committer | glewis <glewis@FreeBSD.org> | 2009-08-24 04:57:57 +0800 |
commit | c8cefb1cc82eba341c724a39cc528c2c3a6623e3 (patch) | |
tree | a600273952e4388688d5c293865d112abc9dcac8 /x11-wm/afterstep-stable | |
parent | 5ac0b64d49c105397372cdcaa9a7e956cd9daee8 (diff) | |
download | freebsd-ports-graphics-c8cefb1cc82eba341c724a39cc528c2c3a6623e3.tar.gz freebsd-ports-graphics-c8cefb1cc82eba341c724a39cc528c2c3a6623e3.tar.zst freebsd-ports-graphics-c8cefb1cc82eba341c724a39cc528c2c3a6623e3.zip |
. Update to 2.2.9.
. Get the packing list right in both the case where share/gnome/wm-properties
does and doesn't exist.
Diffstat (limited to 'x11-wm/afterstep-stable')
-rw-r--r-- | x11-wm/afterstep-stable/Makefile | 11 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/files/patch-configure.h.in | 17 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterBase::parse.c | 13 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterStep::kde.c | 15 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterStep::parser.c | 14 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c | 15 | ||||
-rw-r--r-- | x11-wm/afterstep-stable/pkg-plist | 2 |
8 files changed, 12 insertions, 81 deletions
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 7808906ff7d..a830e0b1af7 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -6,8 +6,7 @@ # PORTNAME= afterstep -PORTVERSION= 2.2.8 -PORTREVISION= 6 +PORTVERSION= 2.2.9 CATEGORIES= x11-wm afterstep MASTER_SITES= ftp://ftp.afterstep.org/stable/ \ SF/${PORTNAME}/AfterStep/${PORTVERSION} @@ -35,7 +34,7 @@ USE_XORG+= ice sm x11 xcursor xext xfixes xi xinerama xrandr xrender GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--disable-ascp \ - --enable-i18n \ + --enable-i18n \ --disable-send-postcard-to-developer \ --with-helpcommand="xterm -e man" \ --with-jpeg-includes="${LOCALBASE}/include" \ @@ -62,6 +61,12 @@ CONFIGURE_ARGS+= --enable-different-looknfeels CONFIGURE_ARGS+= --disable-savewindows .endif +.if exists(${PREFIX}/share/gnome/wm-properties) +PLIST_SUB+= GNOME="" +.else +PLIST_SUB+= GNOME="@comment " +.endif + .include <bsd.port.pre.mk> post-extract: diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo index f852555305e..502987b3d78 100644 --- a/x11-wm/afterstep-stable/distinfo +++ b/x11-wm/afterstep-stable/distinfo @@ -1,3 +1,3 @@ -MD5 (AfterStep-2.2.8.tar.bz2) = 8734622c9cb549f5baa8b3262312db70 -SHA256 (AfterStep-2.2.8.tar.bz2) = 59afbcdbaab3069e3d77973fcae1d870360ac21a981e4fcd45ca62121635c92d -SIZE (AfterStep-2.2.8.tar.bz2) = 6101824 +MD5 (AfterStep-2.2.9.tar.bz2) = 59d739b2416ac18201027d7cc0888c20 +SHA256 (AfterStep-2.2.9.tar.bz2) = 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 +SIZE (AfterStep-2.2.9.tar.bz2) = 6094706 diff --git a/x11-wm/afterstep-stable/files/patch-configure.h.in b/x11-wm/afterstep-stable/files/patch-configure.h.in deleted file mode 100644 index 969d72780e9..00000000000 --- a/x11-wm/afterstep-stable/files/patch-configure.h.in +++ /dev/null @@ -1,17 +0,0 @@ -$FreeBSD$ - ---- configure.h.in.orig Thu Jun 22 10:44:12 2006 -+++ configure.h.in Thu Jun 22 10:44:26 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 --git a/x11-wm/afterstep-stable/files/patch-libAfterBase::parse.c b/x11-wm/afterstep-stable/files/patch-libAfterBase::parse.c deleted file mode 100644 index 71dda047d81..00000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterBase::parse.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- libAfterBase/parse.c.orig Thu Jun 22 11:14:06 2006 -+++ libAfterBase/parse.c Thu Jun 22 11:17:46 2006 -@@ -690,7 +690,7 @@ - char * - tokenskip( const char *ptr, unsigned int n_tokens ) - { -- int tok_no = 0 ; ; -+ int tok_no = 0 ; - register int curr = 0 ; - - if( ptr == NULL ) return NULL ; diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep::kde.c b/x11-wm/afterstep-stable/files/patch-libAfterStep::kde.c deleted file mode 100644 index bdd2ef6c392..00000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep::kde.c +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- libAfterStep/kde.c.orig Thu Jun 22 21:30:40 2006 -+++ libAfterStep/kde.c Thu Jun 22 21:31:14 2006 -@@ -115,8 +115,9 @@ - { - if( (tag = make_kde_config_comment_tag()) != NULL ) - { -+ size_t len; - ++i ; -- int len = strlen( &buffer[i] ) ; -+ len = strlen( &buffer[i] ) ; - while( len > 0 && isspace( buffer[i+len-1] ) ) --len ; - if( len > 0 ) - { diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep::parser.c b/x11-wm/afterstep-stable/files/patch-libAfterStep::parser.c deleted file mode 100644 index 8fd20f0fb0f..00000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep::parser.c +++ /dev/null @@ -1,14 +0,0 @@ -$FreeBSD$ - ---- libAfterStep/parser.c.orig Thu Jun 22 21:33:08 2006 -+++ libAfterStep/parser.c Thu Jun 22 21:33:46 2006 -@@ -771,8 +771,8 @@ - { - while (GetNextStatement (config, ignore_foreign)) - { /* untill not end of text */ -- flags = 0x00; - TermDef *pterm = NULL ; -+ flags = 0x00; - - #ifdef DEBUG_PARSER - fprintf (stderr, "\nSentence Found:[%.50s ...]\n,\tData=\t[%s]", config->tline, config->current_data); diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c b/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c deleted file mode 100644 index 8a9456c1494..00000000000 --- a/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- libAfterStep/screen.c.orig Sat Feb 3 21:34:23 2007 -+++ libAfterStep/screen.c Sat Feb 3 21:34:45 2007 -@@ -135,9 +135,9 @@ - - if ((s = XineramaQueryScreens (dpy, &(scr->xinerama_screens_num))) != NULL) - { -+ static char buf[256] ; - scr->xinerama_screens = safemalloc (sizeof (XRectangle) * scr->xinerama_screens_num); - asxml_var_insert("xroot.xinerama_screens_num", scr->xinerama_screens_num); -- static char buf[256] ; - for (i = 0; i < scr->xinerama_screens_num; ++i) - { - char *append_point = &buf[0]; diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist index fb354ff0460..608c8cdc4e7 100644 --- a/x11-wm/afterstep-stable/pkg-plist +++ b/x11-wm/afterstep-stable/pkg-plist @@ -1365,7 +1365,7 @@ lib/libAfterStep.a %%DATADIR%%/wharf %%DATADIR%%/winlist %%DATADIR%%/wintabs -share/gnome/wm-properties/AfterStep.desktop +%%GNOME%%share/gnome/wm-properties/AfterStep.desktop share/xsessions/AfterStep.desktop @dirrmtry share/xsessions @dirrm %%DATADIR%%/themes |