From: hackbard Date: Thu, 11 Aug 2005 10:21:54 +0000 (+0000) Subject: stage 4 package updates X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19813891fbe232c43c28c601baabc931cfb4d34e;p=hdw-linux%2Fhdw-linux.git stage 4 package updates --- diff --git a/doc/CHANGELOG b/doc/CHANGELOG index aa8a916..f8b0cd5 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,9 @@ *) 2005-08-07 +- several package updates (stage 4) + +*) 2005-08-07 + - some more packages updates *) 2005-08-04 diff --git a/packages/devel/tcltk/tcltk b/packages/devel/tcltk/tcltk index 073b721..449adfb 100644 --- a/packages/devel/tcltk/tcltk +++ b/packages/devel/tcltk/tcltk @@ -2,12 +2,10 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 8.4.6 +# [V] 8.4.11 # [S] 3-4 -# [D] tk8.4.6-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/ -# [D] tcl8.4.6-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/ - -bin_ver="8.6" +# [D] tk8.4.11-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/ +# [D] tcl8.4.11-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/ custmain="1" @@ -21,19 +19,43 @@ custmain() { # prepare environment export VERSION=$ver export V=`echo $ver | awk -F. '{ print $1 "." $2 }'` - export DIR=$PWD # tcl - cd tcl$ver/unix && autoconf && cd dltest && autoconf && cd .. - ./configure $confopt --enable-gcc --enable-shared - make $make_conf && make $install_conf install && - ln -svf tclsh${bin_ver} $prefix/bin/tclsh && + cd tcl$ver + export DIR=$PWD + cd unix + ./configure $confopt --enable-threads + make $make_conf + sed -i "s:${DIR}/unix:$prefix/lib:" tclConfig.sh + sed -i "s:${DIR}:$prefix/include/tcl${V}:" tclConfig.sh + sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," tclConfig.sh + make $install_conf install + install -v -d $prefix/include/tcl${V}/unix + install -v -m644 *.h $prefix/include/tcl${V}/unix/ + install -v -d $prefix/include/tcl${V}/generic + install -v -c -m644 ../generic/*.h $prefix/include/tcl${V}/generic/ + rm -v -f $prefix/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h + ln -v -nsf ../../include/tcl${V} $prefix/lib/tcl${V}/include + ln -v -sf libtcl${V}.so $prefix/lib/libtcl.so + ln -v -sf tclsh${V} $prefix/bin/tclsh cd ../.. # tk - cd tk$ver/unix && - ./configure $confopt --enable-gcc --enable-shared - make $make_conf && make $install_conf install && - ln -svf wish${bin_ver} $prefix/bin/wish + cd tk$ver + export DIR=$PWD + cd unix + ./configure $confopt --enable-threads + make $make_conf + sed -i "s:${DIR}/unix:$prefix/lib:" tkConfig.sh + sed -i "s:${DIR}:$prefix/include/tk${V}:" tkConfig.sh + make $install_conf install + install -v -d $prefix/include/tk${V}/unix + install -v -m644 *.h $prefix/include/tk${V}/unix/ + install -v -d $prefix/include/tk${V}/generic + install -v -m644 ../generic/*.h $prefix/include/tk${V}/generic/ + rm -v -f $prefix/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h + ln -v -nsf ../../include/tk${V} $prefix/lib/tk${V}/include + ln -v -sf libtk${V}.so $prefix/lib/libtk.so + ln -v -sf wish${V} $prefix/bin/wish cd ../.. } diff --git a/packages/hackbard/vim/security.patch b/packages/hackbard/vim/security.patch new file mode 100644 index 0000000..a95a70f --- /dev/null +++ b/packages/hackbard/vim/security.patch @@ -0,0 +1,210 @@ +--- vim63.orig/runtime/doc/options.txt 2004-06-07 09:05:19.000000000 +0000 ++++ vim63/runtime/doc/options.txt 2004-12-30 11:00:23.971481608 +0000 +@@ -1,4 +1,4 @@ +-*options.txt* For Vim version 6.3. Last change: 2004 Jun 01 ++*options.txt* For Vim version 6.3. Last change: 2004 Dec 09 + + + VIM REFERENCE MANUAL by Bram Moolenaar +@@ -139,6 +139,9 @@ + (the ^[ is a real here, use CTRL-V to enter it) + The advantage over a mapping is that it works in all situations. + ++The t_xx options cannot be set from a |modeline| or in the |sandbox|, for ++security reasons. ++ + The listing from ":set" looks different from Vi. Long string options are put + at the end of the list. The number of options is quite large. The output of + "set all" probably does not fit on the screen, causing Vim to give the +@@ -945,6 +948,7 @@ + accidentally overwriting existing files with a backup file. You might + prefer using ".bak", but make sure that you don't have files with + ".bak" that you want to keep. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'backupskip'* *'bsk'* + 'backupskip' 'bsk' string (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*") +@@ -2407,6 +2411,7 @@ + type that is actually stored with the file. + This option is not copied to another buffer, independent of the 's' or + 'S' flag in 'cpoptions'. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'fillchars'* *'fcs'* + 'fillchars' 'fcs' string (default "vert:|,fold:-") +@@ -3599,6 +3604,7 @@ + Setting this option to a valid keymap name has the side effect of + setting 'iminsert' to one, so that the keymap becomes effective. + 'imsearch' is also set to one, unless it was -1 ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'keymodel'* *'km'* + 'keymodel' 'km' string (default "") +@@ -3690,6 +3696,7 @@ + matter what $LANG is set to: > + :set langmenu=nl_NL.ISO_8859-1 + < When 'langmenu' is empty, |v:lang| is used. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + If your $LANG is set to a non-English language but you do want to use + the English menus: > + :set langmenu=none +@@ -4310,6 +4317,7 @@ + Using 'patchmode' for compressed files appends the extension at the + end (e.g., "file.gz.orig"), thus the resulting name isn't always + recognized as a compressed file. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'path'* *'pa'* *E343* *E345* *E347* + 'path' 'pa' string (default on Unix: ".,/usr/include,," +@@ -4424,6 +4432,8 @@ + in the standard printer dialog. + If the option is empty, then vim will use the system default printer + for ":hardcopy!" ++ This option cannot be set from a |modeline| or in the |sandbox|, for ++ security reasons. + + *'printencoding'* *'penc'* *E620* + 'printencoding' 'penc' String (default empty, except for: +@@ -5711,6 +5721,7 @@ + Syntax autocommand event is triggered with the value as argument. + This option is not copied to another buffer, independent of the 's' or + 'S' flag in 'cpoptions'. ++ Only normal file name characters can be used, "/\*?[|<>" are illegal. + + *'tabstop'* *'ts'* + 'tabstop' 'ts' number (default 8) +@@ -6089,6 +6100,8 @@ + This option will be used for the window title when exiting Vim if the + original title cannot be restored. Only happens if 'title' is on or + 'titlestring' is not empty. ++ This option cannot be set from a |modeline| or in the |sandbox|, for ++ security reasons. + *'titlestring'* + 'titlestring' string (default "") + global +--- vim63.orig/src/option.c 2004-05-15 10:20:06.000000000 +0000 ++++ vim63/src/option.c 2004-12-30 11:00:23.966482368 +0000 +@@ -293,6 +293,7 @@ + #define P_SECURE 0x40000L/* cannot change in modeline or secure mode */ + #define P_GETTEXT 0x80000L/* expand default value with _() */ + #define P_NOGLOB 0x100000L/* do not use local value for global vimrc */ ++#define P_NFNAME 0x200000L/* only normal file name chars allowed */ + + /* + * options[] is initialized here. +@@ -413,7 +414,7 @@ + {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, + (char_u *)&p_bdir, PV_NONE, + {(char_u *)DFLT_BDIR, (char_u *)0L}}, +- {"backupext", "bex", P_STRING|P_VI_DEF, ++ {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, + (char_u *)&p_bex, PV_NONE, + { + #ifdef VMS +@@ -846,7 +847,7 @@ + {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, + (char_u *)&p_ffs, PV_NONE, + {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}}, +- {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, ++ {"filetype", "ft", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, + #ifdef FEAT_AUTOCMD + (char_u *)&p_ft, PV_FT, + {(char_u *)"", (char_u *)0L} +@@ -1284,7 +1285,7 @@ + {(char_u *)0L, (char_u *)0L} + #endif + }, +- {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT, ++ {"keymap", "kmp", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME, + #ifdef FEAT_KEYMAP + (char_u *)&p_keymap, PV_KMAP, + {(char_u *)"", (char_u *)0L} +@@ -1330,7 +1331,7 @@ + {(char_u *)NULL, + #endif + (char_u *)0L}}, +- {"langmenu", "lm", P_STRING|P_VI_DEF, ++ {"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME, + #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG) + (char_u *)&p_lm, PV_NONE, + #else +@@ -1562,7 +1563,7 @@ + {(char_u *)0L, (char_u *)0L} + #endif + }, +- {"patchmode", "pm", P_STRING|P_VI_DEF, ++ {"patchmode", "pm", P_STRING|P_VI_DEF|P_NFNAME, + (char_u *)&p_pm, PV_NONE, + {(char_u *)"", (char_u *)0L}}, + {"path", "pa", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, +@@ -1595,7 +1596,7 @@ + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)FALSE, (char_u *)0L}}, +- {"printdevice", "pdev", P_STRING|P_VI_DEF, ++ {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE, + #ifdef FEAT_PRINTER + (char_u *)&p_pdev, PV_NONE, + {(char_u *)"", (char_u *)0L} +@@ -1981,7 +1982,7 @@ + {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, + (char_u *)&p_swb, PV_NONE, + {(char_u *)"", (char_u *)0L}}, +- {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB, ++ {"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME, + #ifdef FEAT_SYN_HL + (char_u *)&p_syn, PV_SYN, + {(char_u *)"", (char_u *)0L} +@@ -2086,7 +2087,7 @@ + (char_u *)NULL, PV_NONE, + #endif + {(char_u *)85L, (char_u *)0L}}, +- {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT, ++ {"titleold", NULL, P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE, + #ifdef FEAT_TITLE + (char_u *)&p_titleold, PV_NONE, + {(char_u *)N_("Thanks for flying Vim"), +@@ -2321,7 +2322,7 @@ + {(char_u *)0L, (char_u *)0L}}, + + /* terminal output codes */ +-#define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL, \ ++#define p_term(sss, vvv) {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \ + (char_u *)&vvv, PV_NONE, \ + {(char_u *)"", (char_u *)0L}}, + +@@ -3302,7 +3303,8 @@ + errmsg = NULL; + startarg = arg; /* remember for error message */ + +- if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3])) ++ if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3]) ++ && !(opt_flags & OPT_MODELINE)) + { + /* + * ":set all" show all options. +@@ -3318,7 +3320,7 @@ + else + showoptions(1, opt_flags); + } +- else if (STRNCMP(arg, "termcap", 7) == 0) ++ else if (STRNCMP(arg, "termcap", 7) == 0 && !(opt_flags & OPT_MODELINE)) + { + showoptions(2, opt_flags); + show_termcodes(); +@@ -4604,6 +4606,15 @@ + errmsg = e_secure; + } + ++ /* Check for a "normal" file name in some options. Disallow a path ++ * separator (slash and/or backslash), wildcards and characters that are ++ * often illegal in a file name. */ ++ else if ((options[opt_idx].flags & P_NFNAME) ++ && vim_strpbrk(*varp, "/\\*?[|<>") != NULL) ++ { ++ errmsg = e_invarg; ++ } ++ + /* 'term' */ + else if (varp == &T_NAME) + { diff --git a/packages/hackbard/vim/vim b/packages/hackbard/vim/vim index 2b7ba72..e78d93c 100644 --- a/packages/hackbard/vim/vim +++ b/packages/hackbard/vim/vim @@ -7,6 +7,7 @@ # [D] vim-6.3.tar.bz2 ftp://ftp.vim.org/pub/vim/unix/ srcdir=vim63 +confopt="$confopt --with-features=huge" pre_install() { echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h diff --git a/packages/multimedia/aalib/aalib b/packages/multimedia/aalib/aalib index 9458090..c843553 100644 --- a/packages/multimedia/aalib/aalib +++ b/packages/multimedia/aalib/aalib @@ -4,4 +4,4 @@ # # [V] 1.4rc5 # [S] 3-4 -# [D] aalib-1.4rc5.tar.gz http://cesnet.dl.sourceforge.net/sourceforge/aa-project/ +# [D] aalib-1.4rc5.tar.gz http://mesh.dl.sourceforge.net/sourceforge/aa-project/ diff --git a/packages/multimedia/liba52/liba52 b/packages/multimedia/liba52/liba52 index 5712e5a..5dbcd10 100644 --- a/packages/multimedia/liba52/liba52 +++ b/packages/multimedia/liba52/liba52 @@ -2,12 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] cvs +# [V] 0.7.4 # [S] 3-3 -# [D] liba52.tar.bz2 cvs:anonymous:cvs.liba52.sourceforge.net:cvsroot/liba52:a52dec +# [D] a52dec-0.7.4.tar.gz http://liba52.sourceforge.net/files/ -srcdir="a52dec" - -pre_install() { - ./bootstrap - } +srcdir="a52dec-$ver" diff --git a/packages/multimedia/libdivxdecore/libdivxdecore b/packages/multimedia/libdivxdecore/libdivxdecore index ca5e3de..465b9cc 100644 --- a/packages/multimedia/libdivxdecore/libdivxdecore +++ b/packages/multimedia/libdivxdecore/libdivxdecore @@ -4,4 +4,4 @@ # # [V] 0.4.7 # [S] 3-3 -# [D] libdivxdecore-0.4.7.tar.gz http://download2.projectmayo.com/dnload/divx4linux/xmps/ +# [D] libdivxdecore-0.4.7.tar.gz http://mirror.isurf.ca/download.sourcemage.org/mirror/ diff --git a/packages/multimedia/libdvbpsi/libdvbpsi b/packages/multimedia/libdvbpsi/libdvbpsi index 5167fcd..30fd11e 100644 --- a/packages/multimedia/libdvbpsi/libdvbpsi +++ b/packages/multimedia/libdvbpsi/libdvbpsi @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.1.4 +# [V] 0.1.5 # [S] 3-3 -# [D] libdvbpsi3-0.1.4.tar.bz2 http://www.videolan.org/pub/libdvbpsi/0.1.4/ +# [D] libdvbpsi4-0.1.5.tar.bz2 http://download.videolan.org/pub/libdvbpsi/0.1.5/ diff --git a/packages/multimedia/libdvdcss/libdvdcss b/packages/multimedia/libdvdcss/libdvdcss index 4098939..a75e4d4 100644 --- a/packages/multimedia/libdvdcss/libdvdcss +++ b/packages/multimedia/libdvdcss/libdvdcss @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.2.8 +# [V] 1.2.9 # [S] 3-3 -# [D] libdvdcss-1.2.8.tar.bz2 http://www.videolan.org/pub/videolan/libdvdcss/1.2.8/ +# [D] libdvdcss-1.2.9.tar.bz2 http://download.videolan.org/pub/libdvdcss/1.2.9/ diff --git a/packages/multimedia/libdvdread/libdvdread b/packages/multimedia/libdvdread/libdvdread index fb8d844..591404b 100644 --- a/packages/multimedia/libdvdread/libdvdread +++ b/packages/multimedia/libdvdread/libdvdread @@ -4,6 +4,6 @@ # # [V] 0.9.4 # [S] 3-3 -# [D] libdvdread-0.9.4.tar.gz http://www.dtek.chalmers.se/groups/dvd/dist/ +# [D] libdvdread-0.9.4.tar.gz http://download.videolan.org/pub/libdvdread/0.9.4/ confopt="$confopt --with-libdvdcss=$root/usr/lib" diff --git a/packages/multimedia/libflash/libflash b/packages/multimedia/libflash/libflash index 2861ba6..24a7e1b 100644 --- a/packages/multimedia/libflash/libflash +++ b/packages/multimedia/libflash/libflash @@ -4,6 +4,6 @@ # # [V] 0.4.10 # [S] 3-4 -# [D] libflash-0.4.10.tar.gz http://directfb.org/download/contrib/ +# [D] libflash-0.4.10.tar.gz http://www.directfb.org/downloads/Misc/ confopt="$confopt --enable-shared --enable-static" diff --git a/packages/multimedia/libjpeg/libjpeg b/packages/multimedia/libjpeg/libjpeg index f480e35..3c919f2 100644 --- a/packages/multimedia/libjpeg/libjpeg +++ b/packages/multimedia/libjpeg/libjpeg @@ -4,7 +4,7 @@ # # [V] v6b # [S] 3-3 -# [D] jpegsrc.v6b.tar.gz http://www.ijg.org/files/ +# [D] jpegsrc.v6b.tar.gz ftp://ftp.uu.net/graphics/jpeg/ srcdir="jpeg-`echo $ver | sed 's/v//'`" confopt="$confopt --enable-shared --enable-static" diff --git a/packages/multimedia/libmpeg3/gcc34.patch b/packages/multimedia/libmpeg3/gcc34.patch new file mode 100644 index 0000000..68ac326 --- /dev/null +++ b/packages/multimedia/libmpeg3/gcc34.patch @@ -0,0 +1,82 @@ +libmpeg3-1.5.4.jbit/video/output.c +--- libmpeg3-1.5.4/video/output.c 2003-11-07 13:32:32.000000000 -0800 ++++ libmpeg3-1.5.4.jbit/video/output.c 2004-04-13 12:54:53.756934515 -0700 +@@ -1062,3 +1062,39 @@ + /* Not used */ + return 0; + } ++ ++#ifdef HAVE_MMX ++/* ++ Make sure that these vars get linked ++ For some reason gcc3.4 doesn't link them ++ There's gotta be a better way to do this, this is just a quick hack ++*/ ++void ___jbit_hack() ++{ ++ void *foo; ++ foo = &mpeg3_MMX_0; ++ foo = mpeg3_MMX_10w; ++ foo = mpeg3_MMX_80w; ++ foo = mpeg3_MMX_00FFw; ++ foo = mpeg3_MMX_Ublucoeff; ++ foo = mpeg3_MMX_Vredcoeff; ++ foo = mpeg3_MMX_Ugrncoeff; ++ foo = mpeg3_MMX_Vgrncoeff; ++ foo = mpeg3_MMX_Ycoeff; ++ foo = mpeg3_MMX_redmask; ++ foo = mpeg3_MMX_grnmask; ++ foo = mpeg3_601_to_rgb; ++ ++ foo = &mpeg3_MMX_U_80; ++ foo = &mpeg3_MMX_V_80; ++ foo = &mpeg3_MMX_U_COEF; ++ foo = &mpeg3_MMX_V_COEF; ++ foo = &mpeg3_MMX_601_Y_COEF; ++ foo = &mpeg3_MMX_601_Y_DIFF; ++ ++ foo = &mpeg3_MMX_U_80_RGB; ++ foo = &mpeg3_MMX_V_80_RGB; ++ foo = &mpeg3_MMX_U_COEF_RGB; ++ foo = &mpeg3_MMX_V_COEF_RGB; ++} ++#endif +--- libmpeg3-1.5.4/video/reconstruct.c 2003-10-14 00:54:14.000000000 -0700 ++++ libmpeg3-1.5.4.jbit/video/reconstruct.c 2004-04-13 12:57:23.280261795 -0700 +@@ -1286,4 +1286,16 @@ + return 0; + } + +- ++#ifdef HAVE_MMX ++/* ++ Make sure that these vars get linked ++ For some reason gcc3.4 doesn't link them ++ There's gotta be a better way to do this, this is just a quick hack ++*/ ++void ___jbit_hack_reconstruct() ++{ ++ void *foo; ++ foo = &MASK_AND; ++ foo = &ADD_1; ++} ++#endif +--- libmpeg3-1.5.4/video/slice.c 2003-10-14 00:54:14.000000000 -0700 ++++ libmpeg3-1.5.4.jbit/video/slice.c 2004-04-13 12:55:54.710884733 -0700 +@@ -706,3 +706,16 @@ + pthread_mutex_destroy(&(slice->output_lock)); + return 0; + } ++ ++#ifdef HAVE_MMX ++/* ++ Make sure that these vars get linked ++ For some reason gcc3.4 doesn't link them ++ There's gotta be a better way to do this, this is just a quick hack ++*/ ++void ___jbit_hack_slice() ++{ ++ void *foo; ++ foo = &MMX_128; ++} ++#endif diff --git a/packages/multimedia/libmpeg3/libmpeg3 b/packages/multimedia/libmpeg3/libmpeg3 index 09ccf53..2a85711 100644 --- a/packages/multimedia/libmpeg3/libmpeg3 +++ b/packages/multimedia/libmpeg3/libmpeg3 @@ -2,13 +2,13 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.5 +# [V] 1.5.4 # [S] 3-3 -# [D] libmpeg3-1.5.tar.gz http://directfb.org/download/contrib/ +# [D] libmpeg3-1.5.4-src.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/heroines/ post_install() { - # copy include files - cp *.h $prefix/include - cp *.inc $prefix/include - cp -r audio video $prefix/include + # copy library + cp -v ${hdw_arch_opt}/libmpeg3.a $prefix/lib + # copy include files + cp -v {libmpeg3,mpeg3private,mpeg3protos}.h $prefix/include } diff --git a/packages/multimedia/libmpeg3/makefile.patch b/packages/multimedia/libmpeg3/makefile.patch deleted file mode 100644 index 7fb7f64..0000000 --- a/packages/multimedia/libmpeg3/makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/Makefile.orig Fri Aug 23 18:07:52 2002 -+++ new/Makefile Fri Aug 23 18:09:22 2002 -@@ -149,6 +149,8 @@ - - install: - cp $(UTILS) /usr/bin -+ cp $(OUTPUT) /usr/lib -+ cp $(SHAREDOUTPUT) /usr/lib - - clean: - rm -rf $(OBJDIR) diff --git a/packages/multimedia/libogg/libogg b/packages/multimedia/libogg/libogg index 33e17fb..72c51e9 100644 --- a/packages/multimedia/libogg/libogg +++ b/packages/multimedia/libogg/libogg @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0 +# [V] 1.1 # [S] 3-3 -# [D] libogg-1.0.tar.gz http://www.vorbis.com/files/1.0/unix/ +# [D] libogg-1.1.tar.gz http://www.vorbis.com/files/1.0.1/unix/ diff --git a/packages/multimedia/libpdf/libpdf b/packages/multimedia/libpdf/libpdf index 31fcfc0..c70322f 100644 --- a/packages/multimedia/libpdf/libpdf +++ b/packages/multimedia/libpdf/libpdf @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 6.0.0p1 +# [V] 6.0.1 # [S] 3-3 -# [D] PDFlib-Lite-6.0.0p1.tar.gz http://www.pdflib.com/products/pdflib/download/600p1src/ +# [D] PDFlib-Lite-6.0.1.tar.gz http://www.pdflib.com/products/pdflib/download/601src/ srcdir="PDFlib-Lite-${ver}" diff --git a/packages/multimedia/libpng/libpng b/packages/multimedia/libpng/libpng index 5e33198..daaa244 100644 --- a/packages/multimedia/libpng/libpng +++ b/packages/multimedia/libpng/libpng @@ -2,13 +2,17 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.2.5 +# [V] 1.2.8 # [S] 3-3 -# [D] libpng-1.2.5.tar.bz2 http://unc.dl.sourceforge.net/sourceforge/libpng/ +# [D] libpng-1.2.8.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/libpng/ + +make_conf="prefix=$prefix ZLIBINC= ZLIBLIB= $make_conf" +install_conf="prefix=$prefix $install_conf" pre_install() { cp -v scripts/makefile.linux Makefile } + post_install() { [ -f $prefix/include/libpng12/png.h ] && \ ln -svf libpng12/png.h $prefix/include/png.h diff --git a/packages/multimedia/libpng/makefile.linux.patch b/packages/multimedia/libpng/makefile.linux.patch index 66df703..fa89243 100644 --- a/packages/multimedia/libpng/makefile.linux.patch +++ b/packages/multimedia/libpng/makefile.linux.patch @@ -1,19 +1,47 @@ ---- old/scripts/makefile.linux.orig Wed Aug 21 20:30:34 2002 -+++ new/scripts/makefile.linux Wed Aug 21 20:34:25 2002 -@@ -13,13 +13,13 @@ - # where "make install" puts libpng12.a, libpng12.so*, - # libpng12/png.h and libpng12/pngconf.h - # Prefix must be a full pathname. --prefix=/usr/local -+prefix=/usr +--- libpng-1.2.8/scripts/libpng.pc.in.orig 2005-01-04 14:06:54.182100728 +0000 ++++ libpng-1.2.8/scripts/libpng.pc.in 2005-01-04 14:07:19.108311368 +0000 +@@ -7,5 +7,5 @@ + Name: libpng12 + Description: Loads and saves PNG files + Version: 1.2.8 +-Libs: -L${libdir} -lpng12 -lz -lm ++Libs: -L${libdir} -lpng12 + Cflags: -I${includedir}/libpng12 +--- libpng-1.2.8/scripts/makefile.linux.orig 2005-01-04 14:07:37.875458328 +0000 ++++ libpng-1.2.8/scripts/makefile.linux 2005-01-04 14:11:03.918135080 +0000 +@@ -34,8 +34,9 @@ + CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ + $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 - # Where the zlib library and include files are located. - #ZLIBLIB=/usr/local/lib - #ZLIBINC=/usr/local/include --ZLIBLIB=../zlib --ZLIBINC=../zlib -+ZLIBLIB=/usr/lib -+ZLIBINC=/usr/include +-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm +-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm ++LIBS=-lz -lm ++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 ++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS) - ALIGN= - # for i386: + RANLIB=ranlib + #RANLIB=echo +@@ -86,7 +87,7 @@ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ + echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ +- echo libs=\"-lpng12 -lz -lm\"; \ ++ echo libs=\"-lpng12\"; \ + cat scripts/libpng-config-body.in ) > libpng-config + chmod +x libpng-config + +@@ -99,12 +100,12 @@ + $(LIBNAME).so.$(PNGVER): $(OBJSDLL) + $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ + -o $(LIBNAME).so.$(PNGVER) \ +- $(OBJSDLL) ++ $(OBJSDLL) $(LIBS) + + libpng.so.3.$(PNGMIN): $(OBJSDLL) + $(CC) -shared -Wl,-soname,libpng.so.3 \ + -o libpng.so.3.$(PNGMIN) \ +- $(OBJSDLL) ++ $(OBJSDLL) $(LIBS) + + pngtest: pngtest.o $(LIBNAME).so + $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) diff --git a/packages/multimedia/libtiff/libtiff b/packages/multimedia/libtiff/libtiff index e04b723..3f0c112 100644 --- a/packages/multimedia/libtiff/libtiff +++ b/packages/multimedia/libtiff/libtiff @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] v3.6.1 +# [V] 3.7.3 # [S] 3-3 -# [D] tiff-v3.6.1.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/ +# [D] tiff-3.7.3.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/ srcdir="tiff-$ver" -confopt="--prefix=$prefix --noninteractive" +#confopt="--prefix=$prefix --noninteractive" diff --git a/packages/multimedia/libtiff/manpages.patch b/packages/multimedia/libtiff/manpages.patch deleted file mode 100644 index 2af08c2..0000000 --- a/packages/multimedia/libtiff/manpages.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./configure.orig 2004-07-17 12:45:17.000000000 +0200 -+++ ./configure 2004-07-17 12:44:25.000000000 +0200 -@@ -1386,6 +1386,7 @@ - if [ -z "${DIR_MAN-}" ]; then - MANPATH=" - $MANPATH -+ /usr/man - /usr/local/man - /usr/contrib/man - /usr/catman/local diff --git a/packages/multimedia/libungif/libungif b/packages/multimedia/libungif/libungif index 0b57603..220cc9d 100644 --- a/packages/multimedia/libungif/libungif +++ b/packages/multimedia/libungif/libungif @@ -2,10 +2,11 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 4.1.0 +# [V] 4.1.3 # [S] 3-3 -# [D] libungif-4.1.0.tar.gz http://www.ibiblio.org/pub/Linux/libs/graphics/ +# [D] libungif-4.1.3.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/libungif/ post_install() { - ln -sfv libungif.so $root/usr/lib/libgif.so + [ ! -f $root/usr/lib/libgif.so ] && + ln -sfv libungif.so $root/usr/lib/libgif.so } diff --git a/packages/multimedia/libvorbis/libvorbis b/packages/multimedia/libvorbis/libvorbis index f4fc079..36b1612 100644 --- a/packages/multimedia/libvorbis/libvorbis +++ b/packages/multimedia/libvorbis/libvorbis @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0 +# [V] 1.0.1 # [S] 3-3 -# [D] libvorbis-1.0.tar.gz http://www.vorbis.com/files/1.0/unix/ +# [D] libvorbis-1.0.1.tar.gz http://www.vorbis.com/files/1.0.1/unix/ confopt="$confopt --with-ogg=$prefix" diff --git a/packages/multimedia/sdl/sdl b/packages/multimedia/sdl/sdl index f0c937e..3dc1b85 100644 --- a/packages/multimedia/sdl/sdl +++ b/packages/multimedia/sdl/sdl @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.2.7 +# [V] 1.2.8 # [S] 3-4 -# [D] SDL-1.2.7.tar.gz http://www.libsdl.org/release/ +# [D] SDL-1.2.8.tar.gz http://www.libsdl.org/release/ srcdir="SDL-$ver" diff --git a/packages/multimedia/speex/speex b/packages/multimedia/speex/speex index 175600c..6a33f4f 100644 --- a/packages/multimedia/speex/speex +++ b/packages/multimedia/speex/speex @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.1.5 +# [V] 1.1.9 # [S] 3-4 -# [D] speex-1.1.5.tar.gz http://speex.org/download/ +# [D] speex-1.1.9.tar.gz http://speex.org/download/ diff --git a/packages/multimedia/vobcopy/vobcopy b/packages/multimedia/vobcopy/vobcopy index 8093ae2..5b3ed54 100644 --- a/packages/multimedia/vobcopy/vobcopy +++ b/packages/multimedia/vobcopy/vobcopy @@ -2,12 +2,12 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.5.13 +# [V] 0.5.14 # [S] 3-4 -# [D] vobcopy-0.5.13.tar.bz2 http://lpn.rnbhq.org/download/ +# [D] vobcopy-0.5.14.tar.bz2 http://lpn.rnbhq.org/download/ -confopt="--prefix=$prefix --bindir=$prefix/bin --mandir=$prefix/man" -confopt="$confopt --with-dvdread-libs=$root/usr --with-lfs" +confopt="--prefix=$prefix --bindir=$prefix/bin --mandir=$prefix/man --with-lfs" +confopt="$confopt --with-dvdread-libs=$prefix --with-dvdcss-libs=$prefix" build_main() { echo "configuring ..." diff --git a/packages/multimedia/xvid/xvid b/packages/multimedia/xvid/xvid index fba907a..10980b8 100644 --- a/packages/multimedia/xvid/xvid +++ b/packages/multimedia/xvid/xvid @@ -13,7 +13,9 @@ pre_install() { } post_install() { - for i in $root/usr/lib/libxvidcore.so.*; do - ln -sfv $i $root/usr/lib/libxvidcore.so - done + if [ ! -f $root/usr/lib/libxvidcore.so ] ; then + for i in $root/usr/lib/libxvidcore.so.*; do + ln -sfv $i $root/usr/lib/libxvidcore.so + done + fi } diff --git a/packages/net/nfs-utils/nfs-utils b/packages/net/nfs-utils/nfs-utils index 63625a1..f0b0088 100644 --- a/packages/net/nfs-utils/nfs-utils +++ b/packages/net/nfs-utils/nfs-utils @@ -4,7 +4,7 @@ # [S] 3-3 # [V] 1.0.7 -# [D] nfs-utils-1.0.7.tar.gz http://mesh.dl.sourceforge.net/sourceforge/nfs/ +# [D] nfs-utils-1.0.7.tar.gz ftp://ftp.kernel.org/pub/linux/utils/nfs/ confopt="$confopt --disable-gss" diff --git a/packages/net/vpnc/vpnc b/packages/net/vpnc/vpnc index 57c8341..ada53ab 100644 --- a/packages/net/vpnc/vpnc +++ b/packages/net/vpnc/vpnc @@ -3,22 +3,13 @@ # author: hackbard # [S] 3-4 -# [V] 0.2-rm+zomb.1 -# [D] vpnc-0.2-rm+zomb.1.tar.gz http://www.unix-ag.uni-kl.de/~massar/vpnc/ +# [V] 0.3.3 +# [D] vpnc-0.3.3.tar.gz http://www.unix-ag.uni-kl.de/~massar/vpnc/ -build_main() { - [ -f ./configure ] && ./configure $confopt - make $make_conf - } +make_conf="PREFIX=$prefix $make_conf" +install_conf="PREFIX=$prefix $install_conf" post_install() { - mkdir -p $prefix/bin - install -m 755 vpnc $prefix/bin/vpnc - install -m 755 vpnc-connect $prefix/bin/vpnc-connect - install -m 755 vpnc-disconnect $prefix/bin/vpnc-disconnect - install -m 644 vpnc.8 $prefix/man/man8/vpnc.8 - mkdir -p $root/etc/vpnc - install -m 700 vpnc.conf $root/etc/vpnc/vpnc.conf rm -rf $docdir && mkdir $docdir cp README $docdir } diff --git a/packages/security/libgcrypt/libgcrypt b/packages/security/libgcrypt/libgcrypt index 67a634b..4e35ef6 100644 --- a/packages/security/libgcrypt/libgcrypt +++ b/packages/security/libgcrypt/libgcrypt @@ -3,5 +3,5 @@ # author: hackbard # [S] 3-3 -# [V] 1.2.0 -# [D] libgcrypt-1.2.0.tar.gz ftp://ftp.gnupg.org/GnuPG/libgcrypt/ +# [V] 1.2.1 +# [D] libgcrypt-1.2.1.tar.gz ftp://ftp.gnupg.org/GnuPG/libgcrypt/ diff --git a/packages/x11/blackbox/blackbox b/packages/x11/blackbox/blackbox index f9b2e2a..9c696ef 100644 --- a/packages/x11/blackbox/blackbox +++ b/packages/x11/blackbox/blackbox @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.70.0rc +# [V] 0.70.0 # [S] 3-4 -# [D] blackbox-0.70.0rc.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/blackboxwm/ +# [D] blackbox-0.70.0.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/blackboxwm/ post_install() { echo "installing hdw menu and styles ..." diff --git a/packages/x11/fontconfig/fontconfig b/packages/x11/fontconfig/fontconfig index e1ef299..8a20794 100644 --- a/packages/x11/fontconfig/fontconfig +++ b/packages/x11/fontconfig/fontconfig @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.3.1 +# [V] 2.3.2 # [S] 3-3 -# [D] fontconfig-2.3.1.tar.gz http://fontconfig.org/release/ +# [D] fontconfig-2.3.2.tar.gz http://fontconfig.org/release/ diff --git a/packages/x11/ghostscript/ghostscript b/packages/x11/ghostscript/ghostscript index e676a31..fec61b3 100644 --- a/packages/x11/ghostscript/ghostscript +++ b/packages/x11/ghostscript/ghostscript @@ -4,22 +4,22 @@ # [V] 7.07.1 # [S] 3-4 -# [D] espgs-7.07.1-source.tar.bz2 ftp://ftp.easysw.com/pub/ghostscript/ -# [D] gnu-gs-fonts-std-6.0.tar.gz ftp://ftp.easysw.com/pub/ghostscript/ -# [D] gnu-gs-fonts-other-6.0.tar.gz ftp://ftp.easysw.com/pub/ghostscript/ +# [D] espgs-7.07.1-source.tar.bz2 http://mesh.dl.sourceforge.net/espgs/ +# [D] ghostscript-fonts-std-8.11.tar.gz ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ +# [D] ghostscript-fonts-other-6.0.tar.gz ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ srcdir="espgs-$ver" -extra_ver="6.0" +std_ver="8.11" +other_ver="6.0" confopt="$confopt --with-drivers=ALL --with-x" post_install() { - mkdir -p $prefix/share/ghostscript/${extra_ver} && - for font in gnu-gs-fonts-std gnu-gs-fonts-other; do + mkdir -p $prefix/share/ghostscript && + for font in ghostscript-fonts-std-${std_ver}.tar.gz \ + ghostscript-fonts-other-${other_ver}.tar.gz; do tar --use-compress-program=gunzip -xf \ - $archdir/$font-${extra_ver}.tar.gz \ - -C $prefix/share/ghostscript/${extra_ver} + $archdir/$font -C $prefix/share/ghostscript/ done - ln -sfv $prefix/share/ghostscript/${extra_ver}/fonts \ - $prefix/share/ghostscript/fonts + chown -R root.root $prefix/share/ghostscript/fonts } diff --git a/packages/x11/lesstif/lesstif b/packages/x11/lesstif/lesstif index 5871f96..fab7197 100644 --- a/packages/x11/lesstif/lesstif +++ b/packages/x11/lesstif/lesstif @@ -2,11 +2,15 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.93.94 -# [S] 3-6 -# [D] lesstif-0.93.94.tar.bz2 http://belnet.dl.sourceforge.net/sourceforge/lesstif/ +# [V] 0.94.4 +# [S] 3-4 +# [D] lesstif-0.94.4.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/lesstif/ -confopt=${confopt//--prefix* /--prefix=$root\/usr\/X11 } -confopt="$confopt --enable-build-Xlt --enable-build-Xbae" -confopt="$confopt --with-xdnd --with-editres --enable-production" -CC="$CC -L$root/src.lesstif/lesstif-$ver/lib/Xm-2.0" +confopt="$confopt --enable-production --with-xdnd --disable-debug" +make_conf="rootdir=$docdir $make_conf" +install_conf="rootdir=$docdir $install_conf" + +post_install() { + mv -v $prefix/X11R6/lib/X11/mwm $root/etc/X11 + ln -v -s ../../../../etc/X11/mwm $prefix/X11R6/lib/X11 + } diff --git a/packages/x11/pkgconfig/pkgconfig b/packages/x11/pkgconfig/pkgconfig index 9c0fe2c..793d9a7 100644 --- a/packages/x11/pkgconfig/pkgconfig +++ b/packages/x11/pkgconfig/pkgconfig @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.15.0 +# [V] 0.18 # [S] 3-4 -# [D] pkgconfig-0.15.0.tar.gz http://www.freedesktop.org/software/pkgconfig/releases/ +# [D] pkgconfig-0.18.tar.gz http://www.freedesktop.org/software/pkgconfig/releases/ diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt index 79aebd0..826e30c 100644 --- a/packages/x11/qt/qt +++ b/packages/x11/qt/qt @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.3.2 +# [V] 3.3.4 # [S] 3-4 -# [D] qt-x11-free-3.3.2.tar.bz2 ftp://ftp.trolltech.com/qt/source/ +# [D] qt-x11-free-3.3.4.tar.bz2 ftp://ftp.trolltech.com/qt/source/ pre_install() { # where is qt stuff diff --git a/packages/x11/synaptics/synaptics b/packages/x11/synaptics/synaptics index 6a8bad9..bd54bfa 100644 --- a/packages/x11/synaptics/synaptics +++ b/packages/x11/synaptics/synaptics @@ -2,12 +2,6 @@ # author: hackbard@hackdaworld.dyndns.org -# [V] 0.13.3 +# [V] 0.14.3 # [S] 3-4 -# [D] synaptics-0.13.3.tar.bz2 http://w1.894.telia.com/~u89404340/touchpad/files/ - -pre_install() { - sed "s%BINDIR = .*%BINDIR = $prefix/bin%g" Makefile > m1~ - sed "s%CFLAGS = \(.*\)%CFLAGS = -I$prefix/X11R6/include \1%g" m1~ > m2~ - sed "s%CFLAGSCLIENT = \(.*\)%CFLAGSCLIENT = -I$prefix/X11R6/include \1%g" m2~ > Makefile - } +# [D] synaptics-0.14.3.tar.bz2 http://w1.894.telia.com/~u89404340/touchpad/files/ diff --git a/packages/x11/windowmaker/windowmaker b/packages/x11/windowmaker/windowmaker index 2eb1c6e..7f704c5 100644 --- a/packages/x11/windowmaker/windowmaker +++ b/packages/x11/windowmaker/windowmaker @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.80.2 +# [V] 0.92.0 # [S] 3-4 -# [D] WindowMaker-0.80.2.tar.bz2 ftp://windowmaker.org/pub/source/release/ +# [D] WindowMaker-0.92.0.tar.bz2 ftp://windowmaker.org/pub/source/release/ srcdir="WindowMaker-${ver}" diff --git a/packages/x11/wmapm/wmapm b/packages/x11/wmapm/wmapm index ff4f8fa..d643b39 100644 --- a/packages/x11/wmapm/wmapm +++ b/packages/x11/wmapm/wmapm @@ -4,7 +4,7 @@ # # [V] 3.1 # [S] 3-4 -# [D] wmapm-3.1.tar.gz http://nis-www.lanl.gov/~mgh/WindowMaker/ +# [D] wmapm-3.1.tar.gz http://dockapps.org/download.php/id/25/ build_main() { cd wmapm && diff --git a/packages/x11/wmitime/wmitime b/packages/x11/wmitime/wmitime index 662e019..2b4963f 100644 --- a/packages/x11/wmitime/wmitime +++ b/packages/x11/wmitime/wmitime @@ -4,7 +4,7 @@ # # [V] 0.3 # [S] 3-4 -# [D] wmitime-0.3.tar.gz http://www.neotokyo.org/illusion/downloads/ +# [D] wmitime-0.3.tar.gz http://dockapps.org/download.php/id/29/ build_main() { cd wmitime && diff --git a/packages/x11/wmmon/debian.patch b/packages/x11/wmmon/debian.patch index 7197c34..ace5ae8 100644 --- a/packages/x11/wmmon/debian.patch +++ b/packages/x11/wmmon/debian.patch @@ -80,10 +80,12 @@ + */ --- wmmon-1.0b2.orig/wmmon/wmmon.c +++ wmmon-1.0b2/wmmon/wmmon.c -@@ -28,6 +28,10 @@ +@@ -28,6 +28,12 @@ Changes: ---- ++ 15/05/2004 (Simon Law, sfllaw@debian.org) ++ * Support disabling of mode-cycling + 23/10/2003 (Simon Law, sfllaw@debian.org) + * Eliminated exploitable static buffers + * Added -geometry support. @@ -91,7 +93,7 @@ 18/05/1998 (Antoine Nulle, warp@xs4all.nl) * MEM/SWAP/UPTIME only updated when visible * Using global file descriptors to reduce file -@@ -65,6 +69,7 @@ +@@ -65,6 +71,7 @@ * First Working Version */ @@ -99,12 +101,13 @@ #include #include #include -@@ -100,31 +105,27 @@ +@@ -100,31 +107,28 @@ /* Global Variables */ /********************/ -char *ProgName; int stat_current = 0; /* now global */ ++int mode_cycling = 1; /* Allow mode-cycling */ FILE *fp_meminfo; FILE *fp_stat; FILE *fp_loadavg; @@ -134,7 +137,7 @@ for (i=1; i= nexttime) { nexttime+=10; @@ -278,7 +283,16 @@ for (i=0; i= 0) { ++ if (but_stat == i && but_stat >= 0 && mode_cycling) { + switch (but_stat) { + case 0: + switch (Event.xbutton.button) { +@@ -430,7 +460,6 @@ } case 1: stat_current++; @@ -286,7 +300,7 @@ if (stat_current == stat_online) stat_current = 0; -@@ -499,43 +522,80 @@ +@@ -499,43 +528,80 @@ void update_stat_mem(stat_dev *st, stat_dev *st2) { @@ -391,7 +405,7 @@ } /*******************************************************************************\ -@@ -545,11 +605,11 @@ +@@ -545,11 +611,11 @@ void get_statistics(char *devname, long *is, long *ds, long *idle) { int i; @@ -405,7 +419,7 @@ *is = 0; *ds = 0; -@@ -557,9 +617,9 @@ +@@ -557,9 +623,9 @@ if (!strncmp(devname, "cpu", 3)) { fseek(fp_stat, 0, SEEK_SET); @@ -418,7 +432,7 @@ /* 1..3, 4 == idle, we don't want idle! */ for (i=0; i<3; i++) { p = strtok(NULL, tokens); -@@ -577,17 +637,35 @@ +@@ -577,17 +643,35 @@ if (!strncmp(devname, "i/o", 3)) { fseek(fp_stat, 0, SEEK_SET); @@ -458,7 +472,7 @@ } } -@@ -715,16 +793,16 @@ +@@ -715,16 +799,17 @@ |* usage *| \*******************************************************************************/ @@ -478,6 +492,7 @@ + printf("\n"); + printf(" -display DISPLAY contact the DISPLAY X server\n"); + printf(" -geometry GEOMETRY position the clock at GEOMETRY\n"); ++ printf(" -l locked view - cannot cycle modes\n"); + printf(" -i start in Disk I/O mode\n"); + printf(" -s start in System Info mode\n"); + printf(" -h display this help and exit\n"); @@ -485,7 +500,7 @@ } /*******************************************************************************\ -@@ -733,7 +811,7 @@ +@@ -733,7 +818,7 @@ void printversion(void) { @@ -498,7 +513,7 @@ + */ --- wmmon-1.0b2.orig/wmmon/wmmon.1 +++ wmmon-1.0b2/wmmon/wmmon.1 -@@ -0,0 +1,185 @@ +@@ -0,0 +1,192 @@ +'\" t +.\" Man page for wmmon +.\" Copyright (c) 2003 Software in the Public Interest, Inc. @@ -541,20 +556,20 @@ +.IP \(bu 4 +a realtime CPU stress meter; +.IP \(bu -+an auto\-scaled average system load meter, like ++an auto-scaled average system load meter, like +.B xload +and +.BR wmavgload ; +.IP \(bu +a realtime disk I/O stress meter; +.IP \(bu -+auto\-scaled disk I/O load meter; ++auto-scaled disk I/O load meter; +.IP \(bu +realtime memory and swap usage meters; +.IP \(bu +a display for system uptime; +.IP \(bu -+three user\-defined commands to launch. ++three user-defined commands to launch. + +.SH OPTIONS + @@ -569,13 +584,20 @@ +.IR X(7x) . + +.TP ++.BR \-l ++Lock the mode, so that it cannot be cycled by clicking on the upper-left ++widget. You can use this to open multiple copies of ++.BR WMMon , ++each set to a different mode. ++ ++.TP +.BR \-i -+start in disk I/O mode, which displays instantaneous disk usage and ++Start in disk I/O mode, which displays instantaneous disk usage and +average disk load. + +.TP +.BR \-s -+start in system information mode, which displays memory usage, swap usage, ++Start in system information mode, which displays memory usage, swap usage, +and uptime. + +.TP @@ -590,12 +612,12 @@ +The +.B WMMon +display can be cycled between CPU, disk I/O, and system -+information displays by clicking on the upper\-left widget. This ++information displays by clicking on the upper-left widget. This +displays CPU information by default. + +WMMon can also be used to launch programs. You may click either left, -+middle, or right mouse buttons in the average\-load section of the -+window. The pre\-configured program will be launched according to the ++middle, or right mouse buttons in the average-load section of the ++window. The pre-configured program will be launched according to the +mouse button clicked. (see +.B CONFIGURATION FILE +below.) @@ -611,7 +633,7 @@ + +Window Maker users should drag and drop the +.B WMMon -+window on the Dock. Then, right\-click on the border of the window and ++window on the Dock. Then, right-click on the border of the window and +select \*(lqSettings...\*(rq. Check \*(lqStart when Window Maker +is started\*(rq. + @@ -634,7 +656,7 @@ +.SH "CONFIGURATION FILE" + +.B WMMon -+can launch three user\-defined commands, triggered by left, middle and ++can launch three user-defined commands, triggered by left, middle and +right mouse button clicks. You can define the commands to launch in +.I $HOME/.wmmonrc + diff --git a/packages/x11/wmmon/wmmon b/packages/x11/wmmon/wmmon index 1565ff5..94018c8 100644 --- a/packages/x11/wmmon/wmmon +++ b/packages/x11/wmmon/wmmon @@ -14,4 +14,5 @@ build_main() { make && mkdir -p $prefix/bin && install -s -m 0755 wmmon $prefix/bin + install -m 0644 wmmon.1 $prefix/man/man1 } diff --git a/packages/x11/wmpower/wmpower b/packages/x11/wmpower/wmpower index 80a643c..ea32977 100644 --- a/packages/x11/wmpower/wmpower +++ b/packages/x11/wmpower/wmpower @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.3.0 +# [V] 0.4.2 # [S] 3-4 -# [D] wmpower-0.3.0.tar.bz2 http://heanet.dl.sourceforge.net/sourceforge/wmpower/ +# [D] wmpower-0.4.2.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/wmpower/ export CPPFLAGS="$CPPFLAGS -I$prefix/X11/include" diff --git a/packages/x11/wmwave/wmwave b/packages/x11/wmwave/wmwave index 6440cdd..6dd0dad 100644 --- a/packages/x11/wmwave/wmwave +++ b/packages/x11/wmwave/wmwave @@ -4,7 +4,7 @@ # # [V] 0-4modified # [S] 3-4 -# [D] wmwave.tar.bz2 http://www.hackdaworld.dyndns.org/download/hdw-linux/hdw-linux-0.3/sources/x11/wmwave/ +# [D] wmwave.tar.bz2 http://www.hackdaworld.org/download/hdw-linux/hdw-linux-1.0/sources/x11/wmwave/ build_main() { rm -fv *.o wmwave diff --git a/packages/x11/xlockmore/xlockmore b/packages/x11/xlockmore/xlockmore index fa96721..1bdb617 100644 --- a/packages/x11/xlockmore/xlockmore +++ b/packages/x11/xlockmore/xlockmore @@ -2,6 +2,6 @@ # author: hackbard@hackdaworld.dyndns.org -# [V] 5.12 +# [V] 5.19 # [S] 3-4 -# [D] xlockmore-5.12.tar.bz2 ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ +# [D] xlockmore-5.19.tar.bz2 ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ diff --git a/packages/x11/xorg/xorg b/packages/x11/xorg/xorg index 459d1c4..1375eb1 100644 --- a/packages/x11/xorg/xorg +++ b/packages/x11/xorg/xorg @@ -2,16 +2,16 @@ # author: hackbard@hackdaworld.dyndns.org -# [V] 6.8.1 +# [V] 6.8.2 # [S] 3-3 -# [D] X11R6.8.1-src1.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src2.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src3.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src4.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src5.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src6.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ -# [D] X11R6.8.1-src7.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.1/src/ +# [D] X11R6.8.2-src1.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src2.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src3.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src4.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src5.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src6.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ +# [D] X11R6.8.2-src7.tar.gz http://ftp.gwdg.de/pub/x11/x.org/pub/X11R6.8.2/src/ custmain="1" custmain() { @@ -45,9 +45,13 @@ custmain() { [ -z `grep 'X11' $root/etc/ld.so.conf` ] && \ echo "/usr/X11R6/lib" >> $root/etc/ld.so.conf - # add xdm + default config file (yes "" | xf86config ??) + # remove xprint.csh file + rm -v $root/etc/profile.d/xprint.csh # symlink ln -svf X11R6 $root/usr/X11 + ln -svf ../X11R6/bin $prefix/bin/X11 + ln -svf ../X11R6/lib/X11 $prefix/lib/X11 + ln -svf ../X11R6/include/X11 $prefix/include/X11 }