Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
+6
View File
@@ -0,0 +1,6 @@
AfterStep is a window manager for the Unix X Window System. Based on the
look and feel of the NeXTStep interface, it provides end users with a
consistent, clean, and elegant desktop.
Some of the distinguishing features of AfterStep compared to other window
managers are its low usage of resources, stability and configurability.
+44
View File
@@ -0,0 +1,44 @@
# $NetBSD: Makefile,v 1.70 2013/06/27 15:52:19 joerg Exp $
DISTNAME= AfterStep-2.2.11
PKGNAME= ${DISTNAME:S/AfterStep/afterstep/}
PKGREVISION= 4
CATEGORIES= wm
MASTER_SITES= ftp://ftp.afterstep.org/stable/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.afterstep.org/
COMMENT= Window manager based on the look and feel of the NeXTStep interface
LICENSE= mit
PKG_INSTALLATION_TYPES= overwrite pkgviews
MAKE_JOBS_SAFE= no
USE_TOOLS+= bash:run gmake perl:run pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-send-postcard-to-developer
REPLACE_PERL+= tools/ascommand.pl tools/installastheme.pl.in tools/makeastheme.pl.in
REPLACE_BASH+= tools/importasmenu
INSTALLATION_DIRS+= share/gnome/wm-properties
.include "../../mk/bsd.prefs.mk"
# for backtrace
.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
LIBS+= -lexecinfo
MAKE_ENV+= EXTRA_LIBRARIES=-lexecinfo
.endif
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/giflib.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+1487
View File
File diff suppressed because it is too large Load Diff
+24
View File
@@ -0,0 +1,24 @@
$NetBSD: distinfo,v 1.18 2013/06/26 21:17:44 joerg Exp $
SHA1 (AfterStep-2.2.11.tar.bz2) = ecfd815b659046281530441af0bc4fc42900d0da
RMD160 (AfterStep-2.2.11.tar.bz2) = a82a4b3fddcbcd97862212669c11d14629e51a4d
Size (AfterStep-2.2.11.tar.bz2) = 6126237 bytes
SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8
SHA1 (patch-afterstep_desktop_desklets_desklet.display) = 8aa9d8e11514086849f1815c838c64c5d538efbf
SHA1 (patch-configure) = 081192b46d025d9da4c5bc1bbb1e65717a8ed655
SHA1 (patch-libAfterBase_ashash.c) = 36a1e19a017186aac7829071fa551eb6fe187609
SHA1 (patch-libAfterBase_asvector.c) = d892e192304a23f32d2c088932f3777b36a026d4
SHA1 (patch-libAfterBase_asvector.h) = d96a967b81d47c3c4a3c1f82e4e8e42fc2e15d7b
SHA1 (patch-libAfterBase_parse.c) = 8d4b65a5d22ffe90c62c6169cebba204d99c73ac
SHA1 (patch-libAfterBase_parse.h) = 18dfeb9444a7760df18a41069557b01b8b723c3b
SHA1 (patch-libAfterImage_asfont.c) = f7ed285b39ba13126531b3e755e20895b1c3857b
SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
SHA1 (patch-libAfterImage_import.c) = 46034b8fac4dd59c46d7491f522512a5de462def
SHA1 (patch-libAfterStep_functions.c) = ae5b9aeca0046d034a59188cc9977e55605a2b7c
SHA1 (patch-libAfterStep_functions.h) = 501e1a95419a8933b918f7d8df28df38e810f69a
SHA1 (patch-libAfterStep_mylook.c) = 56dea9a5acb65dee3faa5adf350c8901bbd495e2
SHA1 (patch-libAfterStep_mylook.h) = 8fede622d4737510880b88c3cf4b94f13e4892f1
SHA1 (patch-src_ASDocGen_Makefile.in) = 36185b1db36dfda33ef1503d55855e9bbf1ea286
SHA1 (patch-src_Animate_Makefile.in) = 5a0db32f7e6acc70cd8778b9d6c2d8d8b379acc9
SHA1 (patch-src_afterstep_asinternals.h) = c19f912d19635dba8c8e07e9ccf7b7463728c9ef
SHA1 (patch-src_afterstep_misc.c) = 5aad3beb297d64896f286a1eebc5f0d931993c3f
+28
View File
@@ -0,0 +1,28 @@
$NetBSD: patch-aa,v 1.5 2005/12/06 13:14:06 joerg Exp $
--- src/afterstep/module.c.orig 2005-12-06 12:58:56.000000000 +0000
+++ src/afterstep/module.c
@@ -33,6 +33,7 @@
#include <signal.h>
#include <stdarg.h>
+#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/file.h>
@@ -380,7 +381,6 @@ LOCAL_DEBUG_OUT( "deleting buffer %p sen
int
FlushQueue (module_t *module)
{
- extern int errno;
int fd;
register struct queue_buff_struct *curr;
@@ -471,7 +471,6 @@ FlushAllQueues()
-#include <sys/errno.h>
static inline int
PositiveWrite (unsigned int channel, send_data_type *ptr, int size)
{
@@ -0,0 +1,22 @@
$NetBSD: patch-afterstep_desktop_desklets_desklet.display,v 1.1 2013/04/07 10:36:54 cheusov Exp $
* fix bash-ism
--- afterstep/desktop/desklets/desklet.display.orig 2007-09-12 15:33:23.000000000 +0000
+++ afterstep/desktop/desklets/desklet.display
@@ -8,7 +8,7 @@ then
for i in `ls $pfad |grep -v $self`
do
echo "$pfad - > $i -> $1"
- if [ $1 == $i ]
+ if [ $1 = $i ]
then
found=1
if [ -f $pfad$1/config ]
@@ -20,7 +20,7 @@ then
fi
fi
done
- if [ $found == 1 ]
+ if [ $found = 1 ]
then
"$pfad$1/$1" | ascompose -T ASdesklet.$1 --override -f - -q -g $x$y -I
else
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-configure,v 1.1 2013/04/07 10:36:54 cheusov Exp $
* fix bash-ism
--- configure.orig 2011-01-13 19:27:10.000000000 +0000
+++ configure
@@ -1810,7 +1810,7 @@ fi;
# Check whether --enable-reuse-font or --disable-reuse-font was given.
if test "${enable_reuse_font+set}" = set; then
enableval="$enable_reuse_font"
- if test x$enableval == "xyes"; then
+ if test x$enableval = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define MODULE_REUSE_LOADED_FONT 1
_ACEOF
@@ -0,0 +1,31 @@
$NetBSD: patch-libAfterBase_ashash.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
--- libAfterBase/ashash.c.orig 2008-03-17 22:42:32.000000000 +0000
+++ libAfterBase/ashash.c
@@ -39,7 +39,7 @@
static ASHashItem* deallocated_mem[DEALLOC_CACHE_SIZE+10] ;
static unsigned int deallocated_used = 0 ;
-static inline void
+static void
free_ashash_item( ASHashItem *item )
{
@@ -531,7 +531,7 @@ remove_curr_hash_item (ASHashIterator *
}
}
-inline ASHashableValue
+ASHashableValue
curr_hash_value (ASHashIterator * iterator)
{
if (iterator)
@@ -542,7 +542,7 @@ curr_hash_value (ASHashIterator * iterat
return (ASHashableValue) ((char *)NULL);
}
-inline void *
+void *
curr_hash_data (ASHashIterator * iterator)
{
if (iterator)
@@ -0,0 +1,40 @@
$NetBSD: patch-libAfterBase_asvector.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
--- libAfterBase/asvector.c.orig 2008-12-02 22:35:37.000000000 +0000
+++ libAfterBase/asvector.c
@@ -126,7 +126,7 @@ LOCAL_DEBUG_CALLER_OUT("0x%lX, 0x%lX, %l
/* 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 @@ inline size_t vector_find_data( ASVector
return i;
}
-inline void vector_move_data_up( ASVector *v, int index, int offset, int length )
+static 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 */
@@ -210,7 +210,7 @@ LOCAL_DEBUG_OUT ("index = %d, offset = %
}
}
-inline void vector_move_data_down( ASVector *v, int index, int offset, int length )
+void vector_move_data_down( ASVector *v, int index, int offset, int length )
{
register int i ;
/* word copying is usually faster then raw memory copying */
@@ -244,7 +244,7 @@ LOCAL_DEBUG_OUT ("index = %d, offset = %
}
}
-inline void vector_set_data( ASVector *v, void *data, int offset, int length)
+void vector_set_data( ASVector *v, void *data, int offset, int length)
{
register int i ;
/* word copying is usually faster then raw memory copying */
@@ -0,0 +1,13 @@
$NetBSD: patch-libAfterBase_asvector.h,v 1.2 2013/04/07 10:36:54 cheusov Exp $
--- libAfterBase/asvector.h.orig 2008-09-15 22:43:12.000000000 +0000
+++ libAfterBase/asvector.h
@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, vo
/* 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 );
@@ -0,0 +1,13 @@
$NetBSD: patch-libAfterBase_parse.c,v 1.1 2013/06/26 21:17:45 joerg Exp $
--- libAfterBase/parse.c.orig 2013-06-26 19:46:08.000000000 +0000
+++ libAfterBase/parse.c
@@ -1027,7 +1027,7 @@ parse_geometry (register char *tline,
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 ;
@@ -0,0 +1,13 @@
$NetBSD: patch-libAfterBase_parse.h,v 1.1 2013/06/26 21:17:45 joerg Exp $
--- libAfterBase/parse.h.orig 2013-06-26 19:42:15.000000000 +0000
+++ libAfterBase/parse.h
@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned
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);
@@ -0,0 +1,58 @@
$NetBSD: patch-libAfterImage_asfont.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
--- libAfterImage/asfont.c.orig 2008-08-15 21:47:37.000000000 +0000
+++ libAfterImage/asfont.c
@@ -367,7 +367,7 @@ release_font( ASFont *font )
return res ;
}
-static inline void
+static void
free_glyph_data( register ASGlyph *asg )
{
if( asg->pixmap )
@@ -1268,7 +1268,7 @@ load_freetype_glyphs( ASFont *font )
}
#endif
-static inline ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
+static ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
{
register ASGlyphRange *r;
ASGlyph *asg = NULL ;
@@ -1300,7 +1300,7 @@ LOCAL_DEBUG_OUT( "%sFound glyph for char
}
-static inline ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
+static ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
{
return get_unicode_glyph( CHAR2UNICODE(c), font );
}
@@ -1368,7 +1368,7 @@ utf8_to_unicode ( const unsigned char *s
return 0;
}
-static inline ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
+static ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
{
UNICODE_CHAR uc = utf8_to_unicode ( (const unsigned char*)utf8 );
LOCAL_DEBUG_OUT( "translated to Unicode 0x%lX(%ld), UTF8 size = %d", uc, uc, UTF8_CHAR_SIZE(utf8[0]) );
@@ -1773,7 +1773,7 @@ get_fancy_text_size( const void *src_tex
return get_text_size_internal( src_text, font, &internal_attr, width, height, length, x_positions );
}
-inline static void
+static void
render_asglyph( CARD8 **scanlines, CARD8 *row,
int start_x, int y, int width, int height,
CARD32 ratio )
@@ -1812,7 +1812,7 @@ render_asglyph( CARD8 **scanlines, CARD8
}
}
-inline static void
+static void
render_asglyph_over( CARD8 **scanlines, CARD8 *row,
int start_x, int y, int width, int height,
CARD32 value )
@@ -0,0 +1,15 @@
$NetBSD: patch-libAfterImage_export.c,v 1.1 2011/04/05 12:02:00 wiz Exp $
Fix build with png-1.5.
--- libAfterImage/export.c.orig 2005-03-09 23:59:06.000000000 +0000
+++ libAfterImage/export.c
@@ -371,7 +371,7 @@ ASImage2png_int ( ASImage *im, void *dat
png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
if ( png_ptr != NULL )
if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
- if( setjmp(png_ptr->jmpbuf) )
+ if( setjmp(png_jmpbuf(png_ptr)) )
{
png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
info_ptr = NULL ;
@@ -0,0 +1,33 @@
$NetBSD: patch-libAfterImage_import.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
* fix for png-1.5
--- libAfterImage/import.c.orig 2010-09-23 20:57:57.000000000 +0000
+++ libAfterImage/import.c
@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
- if ( !setjmp (png_ptr->jmpbuf))
+ if ( !setjmp (png_jmpbuf(png_ptr)))
{
ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
@@ -1447,8 +1447,8 @@ png2ASImage_int( void *data, png_rw_ptr
}
/* clean up after the read, and free any memory allocated - REQUIRED */
png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp) NULL);
- if (info_ptr)
- free (info_ptr);
+// if (info_ptr)
+// free (info_ptr);
}
#if defined(LOCAL_DEBUG) && !defined(NO_DEBUG_OUTPUT)
@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{
- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
memcpy(data, buf->buffer, length);
buf->buffer += length;
}
@@ -0,0 +1,13 @@
$NetBSD: patch-libAfterStep_functions.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
--- libAfterStep/functions.c.orig 2012-05-04 14:34:35.000000000 +0000
+++ libAfterStep/functions.c
@@ -314,7 +314,7 @@ dup_func_data (FunctionData * dst, Funct
}
}
-inline FunctionData *
+FunctionData *
create_named_function( int func, char *name)
{
FunctionData *fdata = safecalloc( 1, sizeof(FunctionData) );
@@ -0,0 +1,13 @@
$NetBSD: patch-libAfterStep_functions.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
--- libAfterStep/functions.h.orig 2012-05-04 14:34:21.000000000 +0000
+++ libAfterStep/functions.h
@@ -250,7 +250,7 @@ FunctionData *String2Func ( const char *
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 );
@@ -0,0 +1,22 @@
$NetBSD: patch-libAfterStep_mylook.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
--- libAfterStep/mylook.c.orig 2012-05-04 14:35:51.000000000 +0000
+++ libAfterStep/mylook.c
@@ -813,7 +813,7 @@ mylook_get_style(MyLook *look, const cha
return NULL;
}
-inline MyDesktopConfig *
+MyDesktopConfig *
mylook_get_desk_config(MyLook *look, long desk)
{
if( look )
@@ -827,7 +827,7 @@ mylook_get_desk_config(MyLook *look, lon
}
-inline MyBackground *
+MyBackground *
mylook_get_desk_back(MyLook *look, long desk)
{
MyBackground *myback = NULL ;
@@ -0,0 +1,17 @@
$NetBSD: patch-libAfterStep_mylook.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
--- libAfterStep/mylook.h.orig 2012-05-04 14:35:54.000000000 +0000
+++ libAfterStep/mylook.h
@@ -401,9 +401,9 @@ void mylook_destroy (MyLook ** look);
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);
@@ -0,0 +1,15 @@
$NetBSD: patch-src_ASDocGen_Makefile.in,v 1.1 2011/05/25 13:17:37 obache Exp $
* staged installation suuport.
--- src/ASDocGen/Makefile.in.orig 2004-11-30 22:57:13.000000000 +0000
+++ src/ASDocGen/Makefile.in
@@ -67,7 +67,7 @@ install.data_html: do_compile
echo "Generating catalogue of installed data files ..." ; \
old_IMAGE_PATH=$(IMAGE_PATH); old_FONT_PATH=$(FONT_PATH); \
FONT_PATH="@with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:@x_libraries@/X11/fonts/TTF"; \
- IMAGE_PATH="@with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
+ IMAGE_PATH="@with_afterdir@/desktop/icons/:$(DESTDIR)@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:$(DESTDIR)@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:$(DESTDIR)@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:$(DESTDIR)@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/"; \
export IMAGE_PATH; export FONT_PATH; \
./ASDocGen -t html --data --css data_html_styles.css -S $(AFTER_SHAREDIR) -D $(AFTER_DOC_DIR)/html/data -l /dev/null ; \
IMAGE_PATH=$(old_IMAGE_PATH); FONT_PATH=$(old_FONT_PATH); \
@@ -0,0 +1,10 @@
$NetBSD: patch-src_Animate_Makefile.in,v 1.1 2013/06/26 21:17:45 joerg Exp $
--- src/Animate/Makefile.in.orig 2013-06-26 19:51:06.000000000 +0000
+++ src/Animate/Makefile.in
@@ -1,5 +1,3 @@
-EXTRA_LIBRARIES = -lm
-
OBJS = Animate.o
PROG = Animate
@@ -0,0 +1,15 @@
$NetBSD: patch-src_afterstep_asinternals.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
--- src/afterstep/asinternals.h.orig 2012-05-04 14:35:02.000000000 +0000
+++ src/afterstep/asinternals.h
@@ -607,8 +607,8 @@ void ParsePopupEntry (char *tline, FILE
/*************************** 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);
@@ -0,0 +1,21 @@
$NetBSD: patch-src_afterstep_misc.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
--- src/afterstep/misc.c.orig 2012-05-04 14:35:08.000000000 +0000
+++ src/afterstep/misc.c
@@ -32,14 +32,14 @@
/****************************************************************************/
/* window management specifics - button ungrabbing convinience functions: */
/****************************************************************************/
-inline void
+void
ungrab_window_buttons( Window w )
{
LOCAL_DEBUG_OUT( "w = %lX", w );
XUngrabButton (dpy, AnyButton, AnyModifier, w);
}
-inline void
+void
ungrab_window_keys (Window w )
{
XUngrabKey (dpy, AnyKey, AnyModifier, w);