- crux-commits - lists.crux.nu

r1049 - crux-2.2/iso/bin
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jw Date: 2006-03-28 17:54:49 +0200 (Tue, 28 Mar 2006) New Revision: 1049 Modified: crux-2.2/iso/bin/setup-helper Log: fix typo in setup-helper Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-28 15:53:25 UTC (rev 1048) +++ crux-2.2/iso/bin/setup-helper 2006-03-28 15:54:49 UTC (rev 1049) @@ -67,7 +67,7 @@ } inject_packages() { - echo "* Packaged injected:" + echo "* Packages injected:" for package in $@; do if [ -z "`pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^$package$`" ]; then echo " $package"

1 0

r1048 - crux-2.2/iso/bin
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jw Date: 2006-03-28 17:53:25 +0200 (Tue, 28 Mar 2006) New Revision: 1048 Modified: crux-2.2/iso/bin/setup-helper Log: remove debug var Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-28 15:51:28 UTC (rev 1047) +++ crux-2.2/iso/bin/setup-helper 2006-03-28 15:53:25 UTC (rev 1048) @@ -5,7 +5,6 @@ ROOT=$1 DB=$ROOT/var/lib/pkg/db -DB=/tmp/db ## those values should be changed: TMPDB=$DB.tmp

1 0

r1047 - crux-2.2/iso/bin
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jw Date: 2006-03-28 17:51:28 +0200 (Tue, 28 Mar 2006) New Revision: 1047 Modified: crux-2.2/iso/bin/setup-helper Log: only rename ports if there's something to do Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-28 13:48:32 UTC (rev 1046) +++ crux-2.2/iso/bin/setup-helper 2006-03-28 15:51:28 UTC (rev 1047) @@ -5,6 +5,7 @@ ROOT=$1 DB=$ROOT/var/lib/pkg/db +DB=/tmp/db ## those values should be changed: TMPDB=$DB.tmp @@ -22,13 +23,18 @@ pkg=$@ filter="sed " + runfilter="no" for tuple in $@; do split=($(echo $tuple|sed -e 's|:| |')) if [ -n "${split[1]}" ] && [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^${split[0]}$` ]; then echo " ${split[0]} -> ${split[1]}" filter="$filter -e 's|^${split[0]}$|${split[1]}|'" + runfilter="yes" fi - done + done + if [ "$runfilter" = "no" ]; then + return + fi :> $TMPDB if [ -f $DB ]; then

1 0

r1046 - crux-2.2
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jaeger Date: 2006-03-28 15:48:32 +0200 (Tue, 28 Mar 2006) New Revision: 1046 Modified: crux-2.2/Makefile Log: Added a build symlink to the chroot for building madwifi Modified: crux-2.2/Makefile =================================================================== --- crux-2.2/Makefile 2006-03-28 10:27:54 UTC (rev 1045) +++ crux-2.2/Makefile 2006-03-28 13:48:32 UTC (rev 1046) @@ -113,16 +113,17 @@ cp kernel/$$FILE $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION); \ cd $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION) && patch -p1 < $$FILE; \ done - @ln -s linux-$(KERNEL_VERSION) $(FAKE_ROOT_DIR)/usr/src/linux + @ln -s linux-$(KERNEL_VERSION) $(FAKE_ROOT_DIR)/usr/src/linux @cp -f kernel/linux-$(KERNEL_VERSION).config $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION)/.config @make -C $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION) oldconfig @make -C $(FAKE_ROOT_DIR)/usr/src/linux-$(KERNEL_VERSION) + @ln -s /usr/src/linux-$(KERNEL_VERSION) $(FAKE_ROOT_DIR)/lib/modules/$(KERNEL_VERSION)/build @cp /etc/resolv.conf $(FAKE_ROOT_DIR)/etc/ @echo "Mounting /dev on $(FAKE_ROOT_DIR)/dev" @mount --bind /dev $(FAKE_ROOT_DIR)/dev @echo "Mounting /proc on $(FAKE_ROOT_DIR)/proc" @mount --bind /proc $(FAKE_ROOT_DIR)/proc - @echo "Mouting $$PWD on $(FAKE_ROOT_DIR)/src" + @echo "Mounting $$PWD on $(FAKE_ROOT_DIR)/src" @mkdir $(FAKE_ROOT_DIR)/src @mount --bind $$PWD $(FAKE_ROOT_DIR)/src @echo "Entering chroot enrivonment"

1 0

r1045 - crux-2.2/ports/opt/libxml2-python
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jue Date: 2006-03-28 12:27:54 +0200 (Tue, 28 Mar 2006) New Revision: 1045 Modified: crux-2.2/ports/opt/libxml2-python/.md5sum crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch Log: libxml2-python: remove absolute paths in patch Modified: crux-2.2/ports/opt/libxml2-python/.md5sum =================================================================== --- crux-2.2/ports/opt/libxml2-python/.md5sum 2006-03-28 03:24:27 UTC (rev 1044) +++ crux-2.2/ports/opt/libxml2-python/.md5sum 2006-03-28 10:27:54 UTC (rev 1045) @@ -1,2 +1,2 @@ e98018a6b562f1fa454e705dde2269de libxml2-2.6.23.tar.bz2 -b083f08fabb388d6d98422e9f73b3404 libxml2-python-config.patch +70f47b812007d9e49d4e2e8096a7e9d6 libxml2-python-config.patch Modified: crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch =================================================================== --- crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch 2006-03-28 03:24:27 UTC (rev 1044) +++ crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch 2006-03-28 10:27:54 UTC (rev 1045) @@ -6,7 +6,7 @@ pythonLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(python_LTLIBRARIES) -@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la -+@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = /usr/lib/libxml2.la ++@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(libdir)/libxml2.la @WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \ @@ -18,7 +18,7 @@ +libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version @WITH_PYTHON_TRUE@mylibs = \ -@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la -+@WITH_PYTHON_TRUE@ /usr/lib/libxml2.la ++@WITH_PYTHON_TRUE@ $(libdir)/libxml2.la @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c

1 0

r1044 - crux-2.2/ports/opt/x11-fonts-corefonts
by crux＠crux.nu 28 Mar '06

28 Mar '06

Author: jaeger Date: 2006-03-28 05:24:27 +0200 (Tue, 28 Mar 2006) New Revision: 1044 Modified: crux-2.2/ports/opt/x11-fonts-corefonts/.md5sum crux-2.2/ports/opt/x11-fonts-corefonts/Pkgfile Log: x11-fonts-corefonts: updated cabextract (works with gcc4) Modified: crux-2.2/ports/opt/x11-fonts-corefonts/.md5sum =================================================================== --- crux-2.2/ports/opt/x11-fonts-corefonts/.md5sum 2006-03-27 17:13:38 UTC (rev 1043) +++ crux-2.2/ports/opt/x11-fonts-corefonts/.md5sum 2006-03-28 03:24:27 UTC (rev 1044) @@ -1,7 +1,7 @@ cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 9637df0e91703179f0723ec095a36cb5 arial32.exe c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe -8fde8ad86f7144943b7e4e5a2da7eddb cabextract-1.0.tar.gz +f4b729c0be7d288660f4fc167de199a1 cabextract-1.1.tar.gz 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 4e412c772294403ab62fb2d247d85c60 courie32.exe 4d90016026e2da447593b41a8d8fa8bd georgi32.exe Modified: crux-2.2/ports/opt/x11-fonts-corefonts/Pkgfile =================================================================== --- crux-2.2/ports/opt/x11-fonts-corefonts/Pkgfile 2006-03-27 17:13:38 UTC (rev 1043) +++ crux-2.2/ports/opt/x11-fonts-corefonts/Pkgfile 2006-03-28 03:24:27 UTC (rev 1044) @@ -5,7 +5,7 @@ name=x11-fonts-corefonts version=1.2 release=1 -source=(http://www.kyz.uklinux.net/downloads/cabextract-1.0.tar.gz \ +source=(http://www.kyz.uklinux.net/downloads/cabextract-1.1.tar.gz \ http://dl.sourceforge.net/sourceforge/corefonts/andale32.exe \ http://dl.sourceforge.net/sourceforge/corefonts/arial32.exe \ http://dl.sourceforge.net/sourceforge/corefonts/arialb32.exe \ @@ -19,10 +19,10 @@ http://dl.sourceforge.net/sourceforge/corefonts/webdin32.exe) build() { - (cd cabextract-1.0 && ./configure && make) + (cd cabextract-1.1 && ./configure && make) for font in *.exe do - cabextract-1.0/cabextract --lowercase $font + cabextract-1.1/cabextract --lowercase $font done mkdir -p $PKG/usr/share/fonts/corefonts install -o root -g root -m 0644 *.ttf \

1 0

r1043 - in crux-2.2/ports/opt: . libxml2-python
by crux＠crux.nu 27 Mar '06

27 Mar '06

Author: jue Date: 2006-03-27 19:13:38 +0200 (Mon, 27 Mar 2006) New Revision: 1043 Added: crux-2.2/ports/opt/libxml2-python/ crux-2.2/ports/opt/libxml2-python/.footprint crux-2.2/ports/opt/libxml2-python/.md5sum crux-2.2/ports/opt/libxml2-python/Pkgfile crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch Log: initial release libxml2-python Added: crux-2.2/ports/opt/libxml2-python/.footprint =================================================================== --- crux-2.2/ports/opt/libxml2-python/.footprint (rev 0) +++ crux-2.2/ports/opt/libxml2-python/.footprint 2006-03-27 17:13:38 UTC (rev 1043) @@ -0,0 +1,9 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/python2.4/ +drwxr-xr-x root/root usr/lib/python2.4/site-packages/ +-rw-r--r-- root/root usr/lib/python2.4/site-packages/drv_libxml2.py +-rw-r--r-- root/root usr/lib/python2.4/site-packages/libxml2.py +-rw-r--r-- root/root usr/lib/python2.4/site-packages/libxml2mod.a +-rwxr-xr-x root/root usr/lib/python2.4/site-packages/libxml2mod.la +-rwxr-xr-x root/root usr/lib/python2.4/site-packages/libxml2mod.so Added: crux-2.2/ports/opt/libxml2-python/.md5sum =================================================================== --- crux-2.2/ports/opt/libxml2-python/.md5sum (rev 0) +++ crux-2.2/ports/opt/libxml2-python/.md5sum 2006-03-27 17:13:38 UTC (rev 1043) @@ -0,0 +1,2 @@ +e98018a6b562f1fa454e705dde2269de libxml2-2.6.23.tar.bz2 +b083f08fabb388d6d98422e9f73b3404 libxml2-python-config.patch Added: crux-2.2/ports/opt/libxml2-python/Pkgfile =================================================================== --- crux-2.2/ports/opt/libxml2-python/Pkgfile (rev 0) +++ crux-2.2/ports/opt/libxml2-python/Pkgfile 2006-03-27 17:13:38 UTC (rev 1043) @@ -0,0 +1,20 @@ +# Description: Python bindings for the XML library version 2 +# URL: http://xmlsoft.org/ +# Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de +# Depends on: python, libxml2 + +name=libxml2-python +version=2.6.23 +release=1 +source=(http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-$version.tar.bz2 \ + $name-config.patch) + +build () { + cd libxml2-$version + patch -p1 < $SRC/$name-config.patch + ./configure --prefix=/usr + cd python + make + make DESTDIR=$PKG install + rm -r $PKG/usr/share +} Added: crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch =================================================================== --- crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch (rev 0) +++ crux-2.2/ports/opt/libxml2-python/libxml2-python-config.patch 2006-03-27 17:13:38 UTC (rev 1043) @@ -0,0 +1,24 @@ +diff -Nru libxml2-2.6.23.orig/python/Makefile.in libxml2-2.6.23/python/Makefile.in +--- libxml2-2.6.23.orig/python/Makefile.in 2006-03-27 18:23:36.000000000 +0200 ++++ libxml2-2.6.23/python/Makefile.in 2006-03-27 18:24:40.000000000 +0200 +@@ -58,7 +58,7 @@ + am__installdirs = "$(DESTDIR)$(pythondir)" + pythonLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(python_LTLIBRARIES) +-@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la ++@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = /usr/lib/libxml2.la + @WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1) + am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c + @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \ +@@ -323,9 +323,9 @@ + libxml2-python-api.xml \ + $(DOCS) + +-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs ++libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version + @WITH_PYTHON_TRUE@mylibs = \ +-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la ++@WITH_PYTHON_TRUE@ /usr/lib/libxml2.la + + @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la + @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c

1 0

r1042 - crux-2.2/ports/opt/libxml2
by crux＠crux.nu 27 Mar '06

27 Mar '06

Author: jue Date: 2006-03-27 19:11:36 +0200 (Mon, 27 Mar 2006) New Revision: 1042 Modified: crux-2.2/ports/opt/libxml2/.footprint crux-2.2/ports/opt/libxml2/Pkgfile Log: libxml2: removed python dependency Modified: crux-2.2/ports/opt/libxml2/.footprint =================================================================== --- crux-2.2/ports/opt/libxml2/.footprint 2006-03-27 16:55:33 UTC (rev 1041) +++ crux-2.2/ports/opt/libxml2/.footprint 2006-03-27 17:11:36 UTC (rev 1042) @@ -61,13 +61,6 @@ -rwxr-xr-x root/root usr/lib/libxml2.so.2.6.23 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc -drwxr-xr-x root/root usr/lib/python2.4/ -drwxr-xr-x root/root usr/lib/python2.4/site-packages/ --rw-r--r-- root/root usr/lib/python2.4/site-packages/drv_libxml2.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/libxml2.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/libxml2mod.a --rwxr-xr-x root/root usr/lib/python2.4/site-packages/libxml2mod.la --rwxr-xr-x root/root usr/lib/python2.4/site-packages/libxml2mod.so -rw-r--r-- root/root usr/lib/xml2Conf.sh drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ Modified: crux-2.2/ports/opt/libxml2/Pkgfile =================================================================== --- crux-2.2/ports/opt/libxml2/Pkgfile 2006-03-27 16:55:33 UTC (rev 1041) +++ crux-2.2/ports/opt/libxml2/Pkgfile 2006-03-27 17:11:36 UTC (rev 1042) @@ -2,16 +2,16 @@ # URL: http://xmlsoft.org/ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de # Packager: Daniel Mueller, daniel at danm dot de -# Depends on: python, zlib +# Depends on: zlib name=libxml2 version=2.6.23 -release=1 +release=2 source=(http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/$name-$version.t… build () { cd $name-$version - ./configure --prefix=/usr --with-python + ./configure --prefix=/usr --without-python make make DESTDIR=$PKG install rm -rf $PKG/usr/doc $PKG/usr/share/{doc,gtk-doc}

1 0

r1041 - crux-2.2/ports/opt/x11
by crux＠crux.nu 27 Mar '06

27 Mar '06

Author: tilman Date: 2006-03-27 18:55:33 +0200 (Mon, 27 Mar 2006) New Revision: 1041 Modified: crux-2.2/ports/opt/x11/Pkgfile Log: (2.2) x11: added libtxc_dxtn to the nice-to-have list Modified: crux-2.2/ports/opt/x11/Pkgfile =================================================================== --- crux-2.2/ports/opt/x11/Pkgfile 2006-03-27 11:11:15 UTC (rev 1040) +++ crux-2.2/ports/opt/x11/Pkgfile 2006-03-27 16:55:33 UTC (rev 1041) @@ -3,6 +3,8 @@ # Packager: Daniel Mueller, daniel at danm dot de # URL: http://xorg.freedesktop.org/wiki/ # Depends on: ncurses, libpng, fontconfig +# +# Nice to have: libtxc_dxtn name=x11 version=6.9.0

1 0

r1040 - crux-2.2/ports/opt/scons
by crux＠crux.nu 27 Mar '06

27 Mar '06

Author: tilman Date: 2006-03-27 13:11:15 +0200 (Mon, 27 Mar 2006) New Revision: 1040 Modified: crux-2.2/ports/opt/scons/.footprint crux-2.2/ports/opt/scons/Pkgfile Log: (2.2) scons: use install to handle the man pages to fix a permission bug and prevent them in the future. Modified: crux-2.2/ports/opt/scons/.footprint =================================================================== --- crux-2.2/ports/opt/scons/.footprint 2006-03-27 07:58:13 UTC (rev 1039) +++ crux-2.2/ports/opt/scons/.footprint 2006-03-27 11:11:15 UTC (rev 1040) @@ -273,5 +273,5 @@ -rw-r--r-- root/root usr/lib/scons/SCons/exitfuncs.pyc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ --r--r--r-- root/root usr/man/man1/scons.1.gz +-rw-r--r-- root/root usr/man/man1/scons.1.gz -rw-r--r-- root/root usr/man/man1/sconsign.1.gz Modified: crux-2.2/ports/opt/scons/Pkgfile =================================================================== --- crux-2.2/ports/opt/scons/Pkgfile 2006-03-27 07:58:13 UTC (rev 1039) +++ crux-2.2/ports/opt/scons/Pkgfile 2006-03-27 11:11:15 UTC (rev 1040) @@ -8,11 +8,11 @@ release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz) -build () { +build() { cd $name-$version + python setup.py install --prefix=/usr --root=$PKG - mkdir -p $PKG/usr/man/man1 - cp scons.1 $PKG/usr/man/man1 - cp sconsign.1 $PKG/usr/man/man1 + install -d $PKG/usr/man/man1 + install -m 644 scons{,ign}.1 $PKG/usr/man/man1 }

1 0