Index: head/x11-wm/afterstep-stable/Makefile =================================================================== --- head/x11-wm/afterstep-stable/Makefile (revision 433088) +++ head/x11-wm/afterstep-stable/Makefile (revision 433089) @@ -1,96 +1,97 @@ # Created by: Brett Taylor # $FreeBSD$ PORTNAME= afterstep PORTVERSION= 2.2.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm afterstep MASTER_SITES= AFTERSTEP/stable DISTNAME= AfterStep-${PORTVERSION} MAINTAINER= glewis@FreeBSD.org COMMENT= Stable version of the AfterStep window manager LIB_DEPENDS= libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ libpng.so:graphics/png \ libtiff.so:graphics/tiff RUN_DEPENDS= xli:graphics/xli USES= execinfo gmake jpeg pkgconfig shebangfix tar:bzip2 USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 librsvg2 pango USE_XORG+= ice sm x11 xcomposite xcursor xdamage xext xfixes xi xinerama \ xrandr xrender GNU_CONFIGURE= yes SHEBANG_FILES= tools/ascommand.pl \ tools/importasmenu MAKE_JOBS_UNSAFE= yes +CFLAGS+= -fgnu89-inline CONFIGURE_ARGS+=--disable-ascp \ --enable-i18n \ --disable-send-postcard-to-developer \ --with-helpcommand="xterm -e man" \ --x-includes="${LOCALBASE}/include" \ --with-jpeg-includes="${LOCALBASE}/include" \ --with-png-includes="${LOCALBASE}/include" \ --with-gif MAKE_ENV+= HOME=- WRKSRC= ${WRKDIR}/${PORTNAME}-devel-${PORTVERSION} .if defined(WITH_DIFFERENT_LOOKNFEELS) CONFIGURE_ARGS+= --enable-different-looknfeels .endif .if !defined(WITH_SAVEWINDOWS) CONFIGURE_ARGS+= --disable-savewindows .endif .include .if exists(${PREFIX}/share/gnome/wm-properties) PLIST_SUB+= GNOME="" .else PLIST_SUB+= GNOME="@comment " .endif .if !exists(/usr/lib/libexecinfo.so) STATIC_LIBEXECINFO= ${LOCALBASE}/lib/libexecinfo.a .endif post-extract: ${CP} ${FILESDIR}/monitor_bsd.xpm \ ${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm post-patch: .for f in afterstep/database @${REINPLACE_CMD} -e 's,linux-penguin,monitor-bsd,' \ ${WRKSRC}/${f} .endfor .for f in libAfterBase/Makefile.in libAfterImage/Makefile.in @${REINPLACE_CMD} -e 's,^install\.,noinstall.,g ; \ s,^install:,install:#,g' ${WRKSRC}/${f} .endfor .for f in libAfterBase/configure libAfterImage/configure @${REINPLACE_CMD} -e 's,="-O3",="$$CFLAGS",g' \ ${WRKSRC}/${f} .endfor .for f in libAfterStep/afterstep-config.in @${REINPLACE_CMD} -e 's,ft_version,libafterstep_version,g' \ ${WRKSRC}/${f} .endfor .for f in configure libAfterBase/configure libAfterConf/Makefile.in libAfterImage/configure tools/makeastheme.pl.in tools/installastheme.pl.in @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} \ -e 's,%%STATIC_LIBEXECINFO%%,${STATIC_LIBEXECINFO},g' \ ${WRKSRC}/configure .if exists(${PREFIX}/share/gnome/wm-properties) pre-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/gnome/wm-properties .endif .include Index: head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c (nonexistent) @@ -1,20 +0,0 @@ ---- libAfterBase/asvector.c.orig 2013-05-01 06:34:11.000000000 -0700 -+++ libAfterBase/asvector.c 2014-04-12 12:22:48.000000000 -0700 -@@ -126,7 +126,7 @@ - - /* finds index of the first element in the vector that is exactly matching specifyed - * data */ --inline size_t vector_find_data( ASVector *v, void *data ) -+size_t vector_find_data( ASVector *v, void *data ) - { - register int i ; - /* word copying is usually faster then raw memory copying */ -@@ -170,7 +170,7 @@ - return i; - } - --inline void vector_move_data_up( ASVector *v, int index, int offset, int length ) -+void vector_move_data_up( ASVector *v, int index, int offset, int length ) - { - register int i ; - /* word copying is usually faster then raw memory copying */ Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h (nonexistent) @@ -1,11 +0,0 @@ ---- libAfterStep/functions.h.orig 2014-04-12 10:22:47.000000000 -0700 -+++ libAfterStep/functions.h 2014-04-11 06:32:13.000000000 -0700 -@@ -314,7 +314,7 @@ - void init_func_data (FunctionData * data); - void copy_func_data (FunctionData * dst, FunctionData * src); - void dup_func_data (FunctionData * dst, FunctionData * src); --inline FunctionData *create_named_function( int func, char *name); -+FunctionData *create_named_function( int func, char *name); - void set_func_val (FunctionData * data, int arg, int value); - int free_func_data (FunctionData * data); - void destroy_func_data( FunctionData **pdata ); Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h (nonexistent) @@ -1,11 +0,0 @@ ---- libAfterBase/asvector.h.orig 2014-04-12 12:22:00.000000000 -0700 -+++ libAfterBase/asvector.h 2014-04-12 12:22:37.000000000 -0700 -@@ -38,7 +38,7 @@ - /* returns index on success, -1 on failure */ - int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before ); - int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index); --inline size_t vector_find_data (ASVector *v, void *data ); -+size_t vector_find_data (ASVector *v, void *data ); - int vector_find_elem( ASVector *v, void *data ); - /* returns 1 on success, 0 on failure */ - int vector_remove_elem( ASVector *v, void *data ); Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/afterstep/misc.c.orig 2014-04-12 12:28:58.000000000 -0700 -+++ src/afterstep/misc.c 2014-04-12 12:29:10.000000000 -0700 -@@ -32,13 +32,13 @@ - /****************************************************************************/ - /* window management specifics - button ungrabbing convinience functions: */ - /****************************************************************************/ --inline void ungrab_window_buttons (Window w) -+void ungrab_window_buttons (Window w) - { - LOCAL_DEBUG_OUT ("w = %lX", w); - XUngrabButton (dpy, AnyButton, AnyModifier, w); - } - --inline void ungrab_window_keys (Window w) -+void ungrab_window_keys (Window w) - { - XUngrabKey (dpy, AnyKey, AnyModifier, w); - } Property changes on: head/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c (nonexistent) @@ -1,29 +0,0 @@ ---- libAfterStep/mylook.c.orig 2014-04-12 12:25:04.000000000 -0700 -+++ libAfterStep/mylook.c 2014-04-12 12:26:22.000000000 -0700 -@@ -843,7 +843,7 @@ - return NULL; - } - --inline MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk) -+MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk) - { - if (look) { - ASHashData hdata = { 0 }; -@@ -856,7 +856,7 @@ - } - - --inline MyBackground *mylook_get_desk_back (MyLook * look, long desk) -+MyBackground *mylook_get_desk_back (MyLook * look, long desk) - { - MyBackground *myback = NULL; - -@@ -888,7 +888,7 @@ - } - - --inline MyBackground *mylook_get_back (MyLook * look, char *name) -+MyBackground *mylook_get_back (MyLook * look, char *name) - { - ASHashData hdata = { 0 }; - if (look && name) Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h (nonexistent) @@ -1,15 +0,0 @@ ---- libAfterStep/mylook.h.orig 2014-04-12 12:24:55.000000000 -0700 -+++ libAfterStep/mylook.h 2014-04-12 12:25:46.000000000 -0700 -@@ -411,9 +411,9 @@ - - - struct MyStyle *mylook_get_style(MyLook *look, const char *name); --inline MyBackground *mylook_get_desk_back(MyLook *look, long desk); --inline MyBackground *mylook_get_back(MyLook *look, char *name); --inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk); -+MyBackground *mylook_get_desk_back(MyLook *look, long desk); -+MyBackground *mylook_get_back(MyLook *look, char *name); -+MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk); - - - Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c (nonexistent) @@ -1,11 +0,0 @@ ---- libAfterBase/parse.c.orig 2014-04-12 10:22:32.000000000 -0700 -+++ libAfterBase/parse.c 2014-04-11 06:31:13.000000000 -0700 -@@ -1027,7 +1027,7 @@ - - static char _as_hex_to_char_table[] = "0123456789ABCDEF"; - --inline int -+int - unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val) - { - int i = buffer_size-1 ; Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h =================================================================== --- head/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/afterstep/asinternals.h.orig 2014-04-12 12:29:08.000000000 -0700 -+++ src/afterstep/asinternals.h 2014-04-12 12:28:35.000000000 -0700 -@@ -689,8 +689,8 @@ - - - /*************************** misc.c *********************************/ --inline void ungrab_window_buttons( Window w ); --inline void ungrab_window_keys (Window w ); -+void ungrab_window_buttons( Window w ); -+void ungrab_window_keys (Window w ); - void MyXGrabButton ( unsigned button, unsigned modifiers, - Window grab_window, Bool owner_events, unsigned event_mask, - int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor); Property changes on: head/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h (nonexistent) @@ -1,11 +0,0 @@ ---- libAfterBase/parse.h.orig 2014-04-12 10:22:23.000000000 -0700 -+++ libAfterBase/parse.h 2014-04-11 06:31:10.000000000 -0700 -@@ -73,7 +73,7 @@ - - double parse_math(const char* str, char** endptr, double size); - --inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val); -+int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val); - char *string_from_int (int param); - char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer); - char *hex_to_buffer(void *data, size_t bytes, char* buffer); Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c (revision 433088) +++ head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c (nonexistent) @@ -1,11 +0,0 @@ ---- libAfterStep/functions.c.orig 2014-04-12 10:22:40.000000000 -0700 -+++ libAfterStep/functions.c 2014-04-11 06:32:05.000000000 -0700 -@@ -307,7 +307,7 @@ - } - } - --inline FunctionData *create_named_function (int func, char *name) -+FunctionData *create_named_function (int func, char *name) - { - FunctionData *fdata = safecalloc (1, sizeof (FunctionData)); - Property changes on: head/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property