From 5ed072bb5655439b0253912291b2cd5539f24af5 Mon Sep 17 00:00:00 2001 From: kueller Date: Tue, 21 Jul 2009 20:14:02 +0000 Subject: [PATCH] Und wieder viele Module durchgeackert git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4855 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/{tools => DebugModules}/clamcour | 3 +- SysBuild/{xsys => DebugModules}/gtk+-1 | 0 SysBuild/{tools => DebugModules}/ming | 8 +- .../{multimedia => DebugModules}/openh323 | 0 SysBuild/dbase/postgresql | 6 +- SysBuild/development/Python | 3 + SysBuild/{xsys => development}/Xdialog | 6 +- SysBuild/{tools => development}/ffcall | 22 +++- SysBuild/{xsys => development}/gtk-doc | 6 +- SysBuild/{xsys => development}/php | 29 ++--- SysBuild/{xsys => guibased}/SDL_image | 2 +- SysBuild/{xsys => guibased}/SDL_mixer | 5 +- SysBuild/{xsys => guibased}/SDL_ttf | 4 +- SysBuild/guibased/efltk | 6 +- SysBuild/{xsys => guibased}/gd | 21 ++-- SysBuild/{xsys => guibased}/gnokii | 12 +- SysBuild/guibased/lesstif | 6 +- SysBuild/guibased/libwmf | 6 +- SysBuild/{xsys => guibased}/sane-frontends | 2 +- SysBuild/{tools => multimedia}/alsa-tools | 56 ++++++--- SysBuild/{xsys => multimedia}/pygame | 13 ++- SysBuild/{xsys => multimedia}/smpeg | 25 ++-- SysBuild/{xsys => multimedia}/xmix | 2 +- SysBuild/{xsys => multimedia}/xmms | 18 +-- SysBuild/network/courier | 14 +-- SysBuild/{tools => network}/courier-analog | 8 +- SysBuild/network/courier-authlib | 32 +++++- SysBuild/network/courier-imap | 106 +++++++++++++++++ SysBuild/network/curl | 5 + SysBuild/{tools => network}/dspam | 2 +- SysBuild/{xsys => network}/ethereal | 8 +- SysBuild/{tools => network}/httpd | 19 +--- SysBuild/{tools => network}/imap | 17 ++- SysBuild/network/jabberd | 9 +- SysBuild/network/neon | 7 +- SysBuild/{tools => network}/procmail | 2 +- SysBuild/{xsys => network}/rdesktop | 4 +- SysBuild/network/sqwebmail | 107 ++++++++++++++++++ SysBuild/network/udns | 3 +- SysBuild/security/clamav | 7 +- SysBuild/{tools => security}/nmap | 6 +- SysBuild/{xsys => tools}/docbook-xsl | 2 +- SysBuild/{DebugModules => tools}/pdflib | 32 +++--- SysBuild/tools/sane-backends | 8 +- SysBuild/tools/scrollkeeper | 14 ++- 45 files changed, 505 insertions(+), 168 deletions(-) rename SysBuild/{tools => DebugModules}/clamcour (99%) rename SysBuild/{xsys => DebugModules}/gtk+-1 (100%) rename SysBuild/{tools => DebugModules}/ming (97%) rename SysBuild/{multimedia => DebugModules}/openh323 (100%) rename SysBuild/{xsys => development}/Xdialog (97%) rename SysBuild/{tools => development}/ffcall (90%) rename SysBuild/{xsys => development}/gtk-doc (97%) rename SysBuild/{xsys => development}/php (89%) rename SysBuild/{xsys => guibased}/SDL_image (99%) rename SysBuild/{xsys => guibased}/SDL_mixer (97%) rename SysBuild/{xsys => guibased}/SDL_ttf (98%) rename SysBuild/{xsys => guibased}/gd (90%) rename SysBuild/{xsys => guibased}/gnokii (96%) rename SysBuild/{xsys => guibased}/sane-frontends (99%) rename SysBuild/{tools => multimedia}/alsa-tools (85%) rename SysBuild/{xsys => multimedia}/pygame (92%) rename SysBuild/{xsys => multimedia}/smpeg (90%) rename SysBuild/{xsys => multimedia}/xmix (99%) rename SysBuild/{xsys => multimedia}/xmms (94%) rename SysBuild/{tools => network}/courier-analog (97%) create mode 100644 SysBuild/network/courier-imap rename SysBuild/{tools => network}/dspam (99%) rename SysBuild/{xsys => network}/ethereal (97%) rename SysBuild/{tools => network}/httpd (92%) rename SysBuild/{tools => network}/imap (88%) rename SysBuild/{tools => network}/procmail (99%) rename SysBuild/{xsys => network}/rdesktop (98%) create mode 100644 SysBuild/network/sqwebmail rename SysBuild/{tools => security}/nmap (98%) rename SysBuild/{xsys => tools}/docbook-xsl (99%) rename SysBuild/{DebugModules => tools}/pdflib (88%) diff --git a/SysBuild/tools/clamcour b/SysBuild/DebugModules/clamcour similarity index 99% rename from SysBuild/tools/clamcour rename to SysBuild/DebugModules/clamcour index cabdde4..4fa0d98 100644 --- a/SysBuild/tools/clamcour +++ b/SysBuild/DebugModules/clamcour @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Security/Net premk() { echo "Nothing to do for premk()" @@ -78,6 +78,7 @@ premk() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/opt/courier \ --sysconfdir=/etc/courier \ diff --git a/SysBuild/xsys/gtk+-1 b/SysBuild/DebugModules/gtk+-1 similarity index 100% rename from SysBuild/xsys/gtk+-1 rename to SysBuild/DebugModules/gtk+-1 diff --git a/SysBuild/tools/ming b/SysBuild/DebugModules/ming similarity index 97% rename from SysBuild/tools/ming rename to SysBuild/DebugModules/ming index b656027..8f3f859 100644 --- a/SysBuild/tools/ming +++ b/SysBuild/DebugModules/ming @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=GuiBased/Lib premk() { mv Makefile.config.in Makefile.config.in.orig @@ -82,7 +82,8 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - ./configure --target=$TARGET32 \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET32 \ --sysconfdir=/etc \ --prefix=/usr make @@ -96,7 +97,8 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ --sysconfdir=/etc \ $ADDOPTIONS \ --prefix=/usr diff --git a/SysBuild/multimedia/openh323 b/SysBuild/DebugModules/openh323 similarity index 100% rename from SysBuild/multimedia/openh323 rename to SysBuild/DebugModules/openh323 diff --git a/SysBuild/dbase/postgresql b/SysBuild/dbase/postgresql index 43026ef..41be0f5 100644 --- a/SysBuild/dbase/postgresql +++ b/SysBuild/dbase/postgresql @@ -105,6 +105,7 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 make maintainer-clean + mv $TMPROOT/opt/PostgreSQL/bin/pg_config{,-32} } mk() { @@ -144,5 +145,8 @@ postmk() { unset DEPFORCE rm -r $TMPROOT/usr GetSVN Viitor_postgresql $TMPROOT - CheckError "postmk() failed !" 1 + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/opt/PostgreSQL/bin/pg_config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/opt/PostgreSQL/bin/pg_config + fi } diff --git a/SysBuild/development/Python b/SysBuild/development/Python index 50f8c25..ff57304 100644 --- a/SysBuild/development/Python +++ b/SysBuild/development/Python @@ -89,6 +89,7 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install mv -v $TMPROOT/usr/bin/python{,-32} && mv -v $TMPROOT/usr/bin/python2.6{,-32} && + mv -v $TMPROOT/usr/bin/python2.6-config{,-32} && mv -v $TMPROOT/usr/include/python2.6/pyconfig{,-32}.h make distclean } @@ -120,9 +121,11 @@ mk() { if [ "$MK64BIT" == "true" ]; then mv -v $TMPROOT/usr/bin/python{,-64} && mv -v $TMPROOT/usr/bin/python2.6{,-64} && + mv -v $TMPROOT/usr/bin/python2.6-config{,-32} && mv -v $TMPROOT/usr/include/python2.6/pyconfig{,-64}.h ln -s multiarch_wrapper $TMPROOT/usr/bin/python ln -s multiarch_wrapper $TMPROOT/usr/bin/python2.6 + ln -s multiarch_wrapper $TMPROOT/usr/bin/python2.6-config fi } diff --git a/SysBuild/xsys/Xdialog b/SysBuild/development/Xdialog similarity index 97% rename from SysBuild/xsys/Xdialog rename to SysBuild/development/Xdialog index 6351d99..55b6446 100644 --- a/SysBuild/xsys/Xdialog +++ b/SysBuild/development/Xdialog @@ -69,7 +69,7 @@ # # -SRCPATH=X11/Development +SRCPATH=Development/Tools premk() { echo "Nothing to do for premk()" @@ -78,9 +78,11 @@ premk() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/$LIBDIR" \ ./configure --target=$TARGET \ --build=$HOSTSYS \ - --prefix=/usr/X11R7 + --prefix=/usr/X11R7 \ + --with-gtk2 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/tools/ffcall b/SysBuild/development/ffcall similarity index 90% rename from SysBuild/tools/ffcall rename to SysBuild/development/ffcall index 4a3caeb..a541e4b 100644 --- a/SysBuild/tools/ffcall +++ b/SysBuild/development/ffcall @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Development/Interpreter #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -80,8 +80,9 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --build=$TARGET32 \ --target=$TARGET32 \ @@ -90,20 +91,31 @@ mk32() { make prefix=$TMPROOT/usr local_prefix=$TMPROOT/usr/share/ffcall install CheckError "Make install process failed !" 1 make distclean + for i in libtrampoline.a \ + libcallback.a \ + libavcall.a; do + GenDynLib32 $TMPROOT/usr/lib/$i 1.10.0 + done } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr && make local_prefix=/usr/share/ffcall && make prefix=$TMPROOT/usr local_prefix=$TMPROOT/usr/share/ffcall install CheckError "Make install process failed !" 1 + for i in libtrampoline.a \ + libcallback.a \ + libavcall.a; do + GenDynLib $TMPROOT/usr/$LIBDIR/$i 1.10.0 + done } postmk() { diff --git a/SysBuild/xsys/gtk-doc b/SysBuild/development/gtk-doc similarity index 97% rename from SysBuild/xsys/gtk-doc rename to SysBuild/development/gtk-doc index ecce259..660cad6 100644 --- a/SysBuild/xsys/gtk-doc +++ b/SysBuild/development/gtk-doc @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/Development +SRCPATH=Development/Tools #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -84,8 +84,8 @@ mk() { CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ --prefix=/usr/X11R7 && - make -k -j $NUMCPU - make -k -j $NUMCPU DESTDIR=$TMPROOT install + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 } diff --git a/SysBuild/xsys/php b/SysBuild/development/php similarity index 89% rename from SysBuild/xsys/php rename to SysBuild/development/php index 76f81ca..80e236a 100644 --- a/SysBuild/xsys/php +++ b/SysBuild/development/php @@ -69,7 +69,7 @@ # # -SRCPATH=X11/Development +SRCPATH=Development/Interpreter #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -86,14 +86,14 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -I/opt/PostgreSQL/include -L/opt/PostgreSQL/$LIBDIR" \ + CXX="g++ $BUILDOPTIONS -I/opt/PostgreSQL/include -L/opt/PostgreSQL/$LIBDIR" \ LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/PostgreSQL/$LIBDIR -L/opt/MySQL/$LIBDIR/mysql" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr \ --sysconfdir=/etc \ - --with-config-dir=/etc \ --with-mysql=/opt/MySQL \ --with-pgsql=/opt/PostgreSQL \ --with-curl=/usr \ @@ -103,37 +103,28 @@ mk() { --with-png-dir=/usr \ --with-zlib-dir \ --with-openssl=/usr \ - --with-bzip2=/usr/$LIBDIR \ --with-gdbm=/usr \ --with-unixODBC=/usr \ --with-regex=php \ - --with-qtdom=/usr/$LIBDIR/qt \ --with-gd=/usr/X11R7 \ - --with-system-regex \ --with-xpm-dir=/usr/X11R7 \ --enable-sockets \ - --enable-yp \ - --enable-versioning \ --enable-ftp \ --enable-calendar \ - --enable-force-cgi-redirect \ --enable-safe-mode \ --enable-sigchild \ --enable-magic-quotes \ --enable-debug=yes \ - --enable-discard-path \ --enable-shared \ - --with-ming=/usr \ --with-snmp=/usr \ - --with-imap=/usr \ - --enable-modules=all \ - --enable-mailparse \ --enable-gd-native-ttf \ + --enable-dba \ --enable-gd-jis-conv - sed -e "s%/opt/MySQL/lib/%/opt/MySQL/$LIBDIR/%g" Makefile | - sed -e "s%X11R7/lib %X11R7/$LIBDIR %" >/tmp/Makefile - mv /tmp/Makefile . + sed -i -e "s%/opt/MySQL/lib/%/opt/MySQL/$LIBDIR/%g" Makefile + sed -i -e "s%/usr/X11R7/lib%/usr/X11R7/$LIBDIR%g" Makefile make -j $NUMCPU && + mkdir -p $TMPROOT/etc/httpd + cp /etc/httpd/httpd.conf $TMPROOT/etc/httpd make -j $NUMCPU INSTALL_ROOT=$TMPROOT install } @@ -141,7 +132,7 @@ mk() { #in $TMPROOT noch einiges korrigieren postmk() { rm -r $TMPROOT/etc/httpd - cp php.ini-dist $TMPROOT/etc/php.ini + cp php.ini-production $TMPROOT/etc/php.ini echo >>$TMPROOT/etc/php.ini "extension=php_ming.so" GetSVN Viitor_php $TMPROOT } diff --git a/SysBuild/xsys/SDL_image b/SysBuild/guibased/SDL_image similarity index 99% rename from SysBuild/xsys/SDL_image rename to SysBuild/guibased/SDL_image index f82acab..2395e02 100644 --- a/SysBuild/xsys/SDL_image +++ b/SysBuild/guibased/SDL_image @@ -67,7 +67,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/lib +SRCPATH=GuiBased/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/xsys/SDL_mixer b/SysBuild/guibased/SDL_mixer similarity index 97% rename from SysBuild/xsys/SDL_mixer rename to SysBuild/guibased/SDL_mixer index b29999c..5ecfe39 100644 --- a/SysBuild/xsys/SDL_mixer +++ b/SysBuild/guibased/SDL_mixer @@ -67,7 +67,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/lib +SRCPATH=GuiBased/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -82,6 +82,7 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ LDFLAGS="-L/usr/X11R7/lib" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr/X11R7 && make -j $NUMCPU && @@ -97,6 +98,8 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/lib64" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr/X11R7 && diff --git a/SysBuild/xsys/SDL_ttf b/SysBuild/guibased/SDL_ttf similarity index 98% rename from SysBuild/xsys/SDL_ttf rename to SysBuild/guibased/SDL_ttf index 8400e0e..0031cb2 100644 --- a/SysBuild/xsys/SDL_ttf +++ b/SysBuild/guibased/SDL_ttf @@ -67,7 +67,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/lib +SRCPATH=GuiBased/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -81,6 +81,7 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ LDFLAGS="-L/usr/X11R7/lib" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr/X11R7 && make -j $NUMCPU && @@ -95,6 +96,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr/X11R7 && diff --git a/SysBuild/guibased/efltk b/SysBuild/guibased/efltk index 15bb9fb..5068aa0 100644 --- a/SysBuild/guibased/efltk +++ b/SysBuild/guibased/efltk @@ -89,6 +89,7 @@ mk32() { make -j $NUMCPU make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install make distclean + mv $TMPROOT/usr/X11R7/bin/efltk-config{,-32} } mk() { @@ -111,5 +112,8 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/X11R7/bin/efltk-config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/efltk-config + fi } diff --git a/SysBuild/xsys/gd b/SysBuild/guibased/gd similarity index 90% rename from SysBuild/xsys/gd rename to SysBuild/guibased/gd index c82351e..8427f69 100644 --- a/SysBuild/xsys/gd +++ b/SysBuild/guibased/gd @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/lib +SRCPATH=GuiBased/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -81,9 +81,10 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr/X11R7 \ --with-png \ @@ -101,14 +102,17 @@ mk32() { CheckError "Make install process failed !" 1 mv libtool.orig libtool make distclean + mv $TMPROOT/usr/X11R7/bin/gdlib-config{,-32} + GenDynLib32 $TMPROOT/usr/X11R7/lib/libgd.a 2.0.33 } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr/X11R7 \ $ADDOPTIONS \ @@ -120,9 +124,12 @@ mk() { make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 + GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libgd.a 2.0.33 } postmk() { - echo "Nothing to do for postmk()" - CheckError "postmk() failed !" 1 + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/X11R7/bin/gdlib-config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/gdlib-config + fi } diff --git a/SysBuild/xsys/gnokii b/SysBuild/guibased/gnokii similarity index 96% rename from SysBuild/xsys/gnokii rename to SysBuild/guibased/gnokii index 1921905..49d8220 100644 --- a/SysBuild/xsys/gnokii +++ b/SysBuild/guibased/gnokii @@ -69,7 +69,7 @@ # # -SRCPATH=X11/Utilities +SRCPATH=GuiBased/Tools premk() { echo "Nothing to do for premk()" @@ -78,13 +78,14 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="gcc $BUILDOPTIONS32" \ + LDFLAGS="-L/opt/MySQL/lib" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --enable-relocatable \ --enable-security \ --with-x \ --prefix=/usr/X11R7 - make - touch gnokii/$TARGET + make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean } @@ -92,17 +93,18 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/X11R7/lib64" - export LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64 -L/opt/gnome/lib64" fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/X11R7/$LIBDIR" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --enable-relocatable \ --enable-security \ --with-x \ $ADDOPTIONS \ --prefix=/usr/X11R7 - make + make -j $NUMCPU touch gnokii/$TARGET make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/guibased/lesstif b/SysBuild/guibased/lesstif index 38c87be..d8409e4 100644 --- a/SysBuild/guibased/lesstif +++ b/SysBuild/guibased/lesstif @@ -97,6 +97,7 @@ mk32() { make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/X11R7/bin/motif-config{,-32} } #Hier wird der Make Prozess der Sourcen definiert @@ -145,5 +146,8 @@ mk() { #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/X11R7/bin/motif-config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/motif-config + fi } diff --git a/SysBuild/guibased/libwmf b/SysBuild/guibased/libwmf index 0ab9996..218f57c 100644 --- a/SysBuild/guibased/libwmf +++ b/SysBuild/guibased/libwmf @@ -94,6 +94,7 @@ mk32(){ make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/bin/libwmf-config{,-32} } #Hier wird der Make Prozess der Sourcen definiert @@ -114,5 +115,8 @@ mk() { #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/libwmf-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/libwmf-config + fi } diff --git a/SysBuild/xsys/sane-frontends b/SysBuild/guibased/sane-frontends similarity index 99% rename from SysBuild/xsys/sane-frontends rename to SysBuild/guibased/sane-frontends index 1595f3f..ea04943 100644 --- a/SysBuild/xsys/sane-frontends +++ b/SysBuild/guibased/sane-frontends @@ -70,7 +70,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/Grafik +SRCPATH=GuiBased/Apps #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/tools/alsa-tools b/SysBuild/multimedia/alsa-tools similarity index 85% rename from SysBuild/tools/alsa-tools rename to SysBuild/multimedia/alsa-tools index 7f30e77..10a5cc3 100644 --- a/SysBuild/tools/alsa-tools +++ b/SysBuild/multimedia/alsa-tools @@ -69,27 +69,38 @@ #Version der Datei: $Revision$ # -SRCPATH=Tools/MultiMedia +SRCPATH=MultiMedia/Lib premk() { echo "Nothing to do for premk()" } mk32() { - for i in *; do + for i in ac3dec \ + as10k1 \ + echomixer \ + envy24control \ + hdsploader \ + ld10k1 \ + mixartloader \ + pcxhrloader \ + rmedigicontrol \ + sb16_csb \ + seq/sbiload \ + sscape_ctl \ + us428control \ + usx2yloader \ + vxloader ; do cd $i CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - LDFLAGS="-L/lib \ - -L/usr/lib \ - -L/usr/X11R7/lib \ - -L/opt/gnome/lib" \ - ./configure --target=$TARGET32 \ - --prefix=/usr + USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/X11R7/lib" \ + ./configure --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean - cd .. + cd - done } @@ -97,20 +108,31 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - for i in *; do + for i in ac3dec \ + as10k1 \ + echomixer \ + envy24control \ + hdsploader \ + ld10k1 \ + mixartloader \ + pcxhrloader \ + rmedigicontrol \ + sb16_csb \ + seq/sbiload \ + sscape_ctl \ + us428control \ + usx2yloader \ + vxloader ; do cd $i CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L/$LIBDIR \ - -L/usr/$LIBDIR \ - -L/usr/X11R7/$LIBDIR \ - -L/opt/gnome/$LIBDIR" \ - ./configure --target=$TARGET \ - $ADDOPTIONS \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/X11R7/$LIBDIR" \ + ./configure $ADDOPTIONS \ --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install - cd .. + cd - done } diff --git a/SysBuild/xsys/pygame b/SysBuild/multimedia/pygame similarity index 92% rename from SysBuild/xsys/pygame rename to SysBuild/multimedia/pygame index 1f85fc9..a7b00f7 100644 --- a/SysBuild/xsys/pygame +++ b/SysBuild/multimedia/pygame @@ -70,14 +70,23 @@ # # -SRCPATH=X11/MultiMedia +SRCPATH=MultiMedia/Apps premk() { echo "Nothing to do for premk()" } +mk32() { + yes|USE_ARCH=$UARCH LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ + python setup.py install --root $TMPROOT + cd .. + rm -r pygame* + UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/pygame*.tar.* + cd pygame* +} + mk() { - yes|LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64" \ + yes|USE_ARCH=$UARCH LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64" \ python setup.py install --root $TMPROOT } diff --git a/SysBuild/xsys/smpeg b/SysBuild/multimedia/smpeg similarity index 90% rename from SysBuild/xsys/smpeg rename to SysBuild/multimedia/smpeg index 2017d8d..8d8a537 100644 --- a/SysBuild/xsys/smpeg +++ b/SysBuild/multimedia/smpeg @@ -69,32 +69,32 @@ # # -SRCPATH=X11/MultiMedia +SRCPATH=MultiMedia/Lib premk() { - echo "Nothing to do for premk()" + ./autogen.sh } mk32() { - CC="/opt/gcc-3/bin/gcc -m32" \ - CXX="/opt/gcc-3/bin/g++ -m32" \ - LDFLAGS="-L/usr/X11R7/lib -lstdc++" \ + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + LDFLAGS="-L/usr/X11R7/lib" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr/X11R7 && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/X11R7/bin/smpeg-config{,-32} } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/X11R7/lib64" - export LDFLAGS="-L/usr/X11R7/lib64 -lstdc++" - else - export LDFLAGS="-L/usr/X11R7/lib -lstdc++" fi - CC="/opt/gcc-3/bin/gcc" \ - CXX="/opt/gcc-3/bin/g++" \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr/X11R7 && @@ -103,5 +103,8 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/X11R7/bin/smpeg-config{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/smpeg-config + fi } diff --git a/SysBuild/xsys/xmix b/SysBuild/multimedia/xmix similarity index 99% rename from SysBuild/xsys/xmix rename to SysBuild/multimedia/xmix index 179c8b1..8a063c1 100644 --- a/SysBuild/xsys/xmix +++ b/SysBuild/multimedia/xmix @@ -70,7 +70,7 @@ # # -SRCPATH=X11/Utilities +SRCPATH=MultiMedia/Apps premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/xsys/xmms b/SysBuild/multimedia/xmms similarity index 94% rename from SysBuild/xsys/xmms rename to SysBuild/multimedia/xmms index 1f64aa5..bfafd6e 100644 --- a/SysBuild/xsys/xmms +++ b/SysBuild/multimedia/xmms @@ -67,7 +67,7 @@ # # -SRCPATH=X11/MultiMedia +SRCPATH=MultiMedia/Apps #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -79,10 +79,11 @@ premk() { } mk32() { - CC="/opt/gcc-3/bin/gcc -m32" \ - CXX="/opt/gcc-3/bin/g++ -m32" \ + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ - ./configure --target=$TARGET32 \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET32 \ --prefix=/usr \ --with-xml-prefix=/usr/lib && make -j $NUMCPU && @@ -95,13 +96,14 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="/opt/gcc-3/bin/gcc" \ - CXX="/opt/gcc-3/bin/g++" \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ LDFLAGS="-L/lib64 -L/usr/lib64 -L/usr/X11R7/lib64" \ - ./configure --target=$TARGET \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ - --with-xml-prefix=/usr/lib && + --with-xml-prefix=/usr/$LIBDIR && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/network/courier b/SysBuild/network/courier index 7e3fb84..8cb40d8 100644 --- a/SysBuild/network/courier +++ b/SysBuild/network/courier @@ -79,13 +79,12 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/opt/courier/lib64" fi - CBUILDOPT=`echo $BUILDOPTIONS|sed -e "s/-mieee-fp //"` - CC="gcc $CBUILDOPT" \ - CXX="g++ $CBUILDOPT" \ - ./configure --target=$TARGET \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/lib64" \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ --sysconfdir=/etc/courier \ - --enable-utf7-folder-encoding \ - --enable-unicode \ --disable-root-check \ $ADDOPTIONS \ --prefix=/opt/courier @@ -94,7 +93,7 @@ mk() { make install make install-configure mkdir -p $TMPROOT/etc/ - cp -a /etc/courier/* $TMPROOT/etc/courier + tar -C /etc/courier -cf - .|tar -C $TMPROOT/etc/courier -xvf - make uninstall } @@ -104,5 +103,4 @@ postmk() { cp INSTALL* $TMPROOT/usr/share/doc/courier cp README* $TMPROOT/usr/share/doc/courier tar cvf - `find | grep "\.html"` | tar xvf - -C $TMPROOT/usr/share/doc/courier - ClearHostSysNameing $TMPROOT } diff --git a/SysBuild/tools/courier-analog b/SysBuild/network/courier-analog similarity index 97% rename from SysBuild/tools/courier-analog rename to SysBuild/network/courier-analog index b9a2d1c..ede443b 100644 --- a/SysBuild/tools/courier-analog +++ b/SysBuild/network/courier-analog @@ -69,16 +69,16 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Monitor premk() { echo "Nothing to do for premk()" } mk() { - ./configure --host=$BUILDSYS \ - --target=$TARGET \ - --build=$BUILDSYS \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + ./configure --build=$TARGET \ --sysconfdir=/etc/courier \ --prefix=/opt/courier make -j $NUMCPU diff --git a/SysBuild/network/courier-authlib b/SysBuild/network/courier-authlib index c660b55..e66b0d2 100644 --- a/SysBuild/network/courier-authlib +++ b/SysBuild/network/courier-authlib @@ -75,20 +75,40 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/lib" \ + ./configure --build=$TARGET32 \ + --with-authuserdb \ + --with-authmysql \ + --with-mysql-libs=/opt/MySQL/lib/mysql \ + --with-mysql-includes=/opt/MySQL/include/mysql \ + --sysconfdir=/etc/courier \ + --libexecdir=/usr/sbin \ + --prefix=/usr + make -j $NUMCPU + make DESTDIR=$TMPROOT install + make DESTDIR=$TMPROOT install-migrate + make DESTDIR=$TMPROOT install-configure + make distclean + mv $TMPROOT/usr/bin/courierauthconfig{,-32} +} + mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/$LIBDIR" \ + ./configure --build=$TARGET \ --with-authuserdb \ --with-authmysql \ - --with-authpgsql \ --with-mysql-libs=/opt/MySQL/$LIBDIR/mysql \ --with-mysql-includes=/opt/MySQL/include/mysql \ - --with-pgsql-libsd=/opt/PostgreSQL/$LIBDIR \ - --with-pgsql-includes=/opt/PostgreSQL/include \ --sysconfdir=/etc/courier \ $ADDOPTIONS \ --libexecdir=/usr/sbin \ @@ -105,4 +125,8 @@ postmk() { cp INSTALL* $TMPROOT/usr/share/doc/courier-authlib cp README* $TMPROOT/usr/share/doc/courier-authlib tar cvf - `find | grep \.html` | tar xvf - -C $TMPROOT/usr/share/doc/courier-authlib + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/courierauthconfig{,-64} + ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/courierauthconfig + fi } diff --git a/SysBuild/network/courier-imap b/SysBuild/network/courier-imap new file mode 100644 index 0000000..f9e4a6e --- /dev/null +++ b/SysBuild/network/courier-imap @@ -0,0 +1,106 @@ +#!/bin/bash +#Framework, welches ein komplettes Linux System aus den Sourcen erstellt +#dieses Framework wird im CVS Repository +#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt +# +#Lage dieser Datei im Archiv: $HeadURL: svn://www.compuextreme.de/Viitor/V962/ViitorMake/SysBuild/network/courier $ +# +#(c) 2003 Harald Kueller, Germany +#This program is free software; you can redistribute it and/or +#modify ist under the terms of the GNU General Public License +#as published by the Free Software Foundation; either version +#2 of the License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +#See the GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program; if not write to the Free Software Foundation, +#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines +#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk +#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können +#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden +#mk() umfasst die source Konfiguration und das Übersetzten des source +#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass +#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit +#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann +#vor der packeterstellung noch einiges am installationtree ändern. postmk +#läuft nachdem die Packetabhängigkeiten erstellt wurden. +#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden. +#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden +#erkannt: +# +# 1 : Package Erzeugung erzwingen. Packet wird, auch wenn es schon +# vorhanden ist, ohne weitere rückfragen neu Erzeugt. +# 2 : Package Installation erzwingen. Installpkg wird mit -f aufgerufen. +# Das bewirkt, das installpkg keine rückfragen bei der installation +# Stellt, und das packet in jedemfall (neu) installiert. +# 4 : Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt +# muss sich das Module selber um das Entpacken der sourcedateien kümmern. +# vor allem wichtig bei Packeten, für die es keine source.tgz gibt +# (z.B. aus dem CVS generierte Packete). +# 8 : Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei +# manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht +# aus dem Namen des sourcearchives ableiten lässt. Packet sollte in +# so einem Fall in der postmk() Funktion erstellt werden. +# 16 : Packet wird nicht installiert. Bei Packeten wie tar oder bash kann +# die installation mittelst installpkg probleme machen. +# 32 : Dependics File so erzeugen, das die Abhängigkeiten bei der installation +# erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden +# packeten die installation ab, und gibt nicht "nur" warnmeldungen aus. +# Wichtig bei packeten mit postinstallroutine, die software aus dem +# frisch installierten Packet verwendet (wie z.B. postgresql) +# 64 : sourcetree aufräumen nach packeterstellung unterbinden. +# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum +# kümmern + +#Module zur Erstellung des Packetes: courier-imap +#Quelle der Source Archive: http://www.courier-mta.org +#Kurzbeschreibung: imap server +# +# +#Letzte Änderung von: $Author: kueller $ +#Datum der letzten Änderung: $Date: 2009-06-05 11:51:42 +0200 (Fr, 05 Jun 2009) $ +#Version der Datei: $Revision: 4794 $ +# +# + +SRCPATH=Network/Servers + +premk() { + echo "Nothing to do for premk()" +} + +mk() { + if [ "$MK64BIT" == "true" ]; then + ADDOPTIONS="--libdir=/opt/courier/lib64" + fi + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/lib64" \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ + --sysconfdir=/etc/courier \ + --disable-root-check \ + $ADDOPTIONS \ + --prefix=/opt/courier + make -j $NUMCPU + make DESTDIR=$TMPROOT install + make install + make install-configure + mkdir -p $TMPROOT/etc/ + tar -C /etc/courier -cf - .|tar -C $TMPROOT/etc/courier -xvf - + make uninstall +} + +postmk() { + GetSVN Viitor_courier $TMPROOT + mkdir -p $TMPROOT/usr/share/doc/courier + cp INSTALL* $TMPROOT/usr/share/doc/courier + cp README* $TMPROOT/usr/share/doc/courier + tar cvf - `find | grep "\.html"` | tar xvf - -C $TMPROOT/usr/share/doc/courier +} diff --git a/SysBuild/network/curl b/SysBuild/network/curl index 0c5592d..2163b79 100644 --- a/SysBuild/network/curl +++ b/SysBuild/network/curl @@ -91,6 +91,7 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install && CheckError "Make install process failed !" 1 make distclean + mv $TMPROOT/usr/bin/curl-config{,-32} } mk() { @@ -113,4 +114,8 @@ mk() { postmk() { mkdir -p $TMPROOT/usr/share mv $TMPROOT/usr/man $TMPROOT/usr/share + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/curl-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/curl-config + fi } diff --git a/SysBuild/tools/dspam b/SysBuild/network/dspam similarity index 99% rename from SysBuild/tools/dspam rename to SysBuild/network/dspam index f3a0171..0807e51 100644 --- a/SysBuild/tools/dspam +++ b/SysBuild/network/dspam @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Other premk() { echo "Nothing to do for premk()" diff --git a/SysBuild/xsys/ethereal b/SysBuild/network/ethereal similarity index 97% rename from SysBuild/xsys/ethereal rename to SysBuild/network/ethereal index b162cfc..bcd641f 100644 --- a/SysBuild/xsys/ethereal +++ b/SysBuild/network/ethereal @@ -69,7 +69,7 @@ # # -SRCPATH=X11/Net +SRCPATH=Network/Monitor premk() { echo "Nothing to do for premk()" @@ -78,7 +78,8 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - ./configure --target=$TARGET32 \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET32 \ --bindir=/usr/X11R7/bin \ --sbindir=/usr/X11R7/sbin \ --libexecdir=/usr/X11R7/libexec \ @@ -98,7 +99,8 @@ mk32() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ --bindir=/usr/X11R7/bin \ --sbindir=/usr/X11R7/sbin \ --libexecdir=/usr/X11R7/libexec \ diff --git a/SysBuild/tools/httpd b/SysBuild/network/httpd similarity index 92% rename from SysBuild/tools/httpd rename to SysBuild/network/httpd index f1c4973..8fa765f 100644 --- a/SysBuild/tools/httpd +++ b/SysBuild/network/httpd @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Servers premk() { echo "Nothing to do for premk()" @@ -78,7 +78,9 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - ./configure --host=$TARGET32 \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \ + ./configure --build=$TARGET32 \ --sysconfdir=/etc/httpd \ --enable-modules=all \ --enable-mods-shared=all \ @@ -103,7 +105,8 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --host=$TARGET \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ --sysconfdir=/etc/httpd \ --enable-modules=all \ --enable-mods-shared=all \ @@ -116,20 +119,10 @@ mk() { --with-pgsql=/opt/PostgreSQL \ $ADDOPTIONS \ --prefix=/opt/apache2 - if [ "$MK64BIT" == "true" ]; then - sed -e "s%lib/libexpat%lib64/libexpat%" \ - srclib/apr-util/Makefile >/tmp/Makefile - mv /tmp/Makefile srclib/apr-util/ - fi make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { - cp -av /opt/apache2 $TMPROOT GetSVN Viitor_httpd $TMPROOT - cd $TMPROOT/apache2 - tar -cf - .|tar -C ../opt/apache2 -xvf - - cd - - rm -r $TMPROOT/apache2 } diff --git a/SysBuild/tools/imap b/SysBuild/network/imap similarity index 88% rename from SysBuild/tools/imap rename to SysBuild/network/imap index 57b1024..da98a1e 100644 --- a/SysBuild/tools/imap +++ b/SysBuild/network/imap @@ -69,7 +69,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=Network/Lib premk() { echo "Nothing to do for premk()" @@ -78,13 +78,11 @@ premk() { mk32() { mv src/osdep/unix/Makefile src/osdep/unix/Makefile.orig sed -e "s/^SSLDIR=.*/SSLDIR=\/usr/g" src/osdep/unix/Makefile.orig >src/osdep/unix/Makefile - make CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32" slx + make CC="gcc $BUILDOPTIONS32 -fPIC" CXX="g++ $BUILDOPTIONS32 -fPIC" slx mkdir -p $TMPROOT/usr/lib $TMPROOT/usr/include cp c-client/c-client.a $TMPROOT/usr/lib/libc-client.a - cp c-client/rfc822.h $TMPROOT/usr/include - cp c-client/mail.h $TMPROOT/usr/include - cp c-client/linkage.h $TMPROOT/usr/include make clean + GenDynLib32 $TMPROOT/usr/lib/libc-client.a 2.0.7 } mk() { @@ -96,6 +94,15 @@ mk() { cp c-client/rfc822.h $TMPROOT/usr/include cp c-client/mail.h $TMPROOT/usr/include cp c-client/linkage.h $TMPROOT/usr/include + cp src/c-client/c-client.h $TMPROOT/usr/include + cp src/c-client/smtp.h $TMPROOT/usr/include + cp src/c-client/nntp.h $TMPROOT/usr/include + cp src/c-client/utf8.h $TMPROOT/usr/include + cp src/c-client/utf8aux.h $TMPROOT/usr/include + cp src/c-client/misc.h $TMPROOT/usr/include + cp src/osdep/mac/osdep.h $TMPROOT/usr/include + cp src/osdep/mac/os_mac.h $TMPROOT/usr/include + GenDynLib $TMPROOT/usr/$LIBDIR/libc-client.a 2.0.7 } postmk() { diff --git a/SysBuild/network/jabberd b/SysBuild/network/jabberd index 81dc84f..ece0bca 100644 --- a/SysBuild/network/jabberd +++ b/SysBuild/network/jabberd @@ -79,9 +79,11 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/$LIBDIR/sasl2 \ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LIBS="-L/opt/MySQL/$LIBDIR/mysql -lmysqlclient" \ + LIBS="-L/opt/MySQL/$LIBDIR/mysql -lmysqlclient \ + -L/usr/$LIBDIR/sasl2 -lgssapiv2 -lgssapi_krb5" \ ./configure --target=$TARGET \ $ADDOPTIONS \ --with-extra-include-path=/opt/MySQL/include/mysql/:/opt/PostgreSQL/include/ \ @@ -94,9 +96,10 @@ mk() { --enable-anon \ --enable-fs \ --disable-gsasl \ - --enable-cyrus \ --prefix=/usr \ - --sysconfdir=/etc/jabberd + --sysconfdir=/etc/jabberd \ + --with-sasl=cyrus + sed -i -e "s%#error Cyrus%//#error Cyrus%" sx/sasl_cyrus.c make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/network/neon b/SysBuild/network/neon index 7843811..df8eef8 100644 --- a/SysBuild/network/neon +++ b/SysBuild/network/neon @@ -79,6 +79,7 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/Lib" \ ./configure --target=$TARGET32 \ --enable-shared \ --with-libxml2 \ @@ -89,6 +90,7 @@ mk32() { make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/bin/neon-config{,-32} } mk() { @@ -111,5 +113,8 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/neon-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/neon-config + fi } diff --git a/SysBuild/tools/procmail b/SysBuild/network/procmail similarity index 99% rename from SysBuild/tools/procmail rename to SysBuild/network/procmail index 4923abe..b4422b1 100644 --- a/SysBuild/tools/procmail +++ b/SysBuild/network/procmail @@ -70,7 +70,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Other #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/xsys/rdesktop b/SysBuild/network/rdesktop similarity index 98% rename from SysBuild/xsys/rdesktop rename to SysBuild/network/rdesktop index d87c635..2332c68 100644 --- a/SysBuild/xsys/rdesktop +++ b/SysBuild/network/rdesktop @@ -70,14 +70,14 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/Net +SRCPATH=Network/Clients #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= premk() { - X11R7_Fix + echo "Nothing to do for premk()" } mk() { diff --git a/SysBuild/network/sqwebmail b/SysBuild/network/sqwebmail new file mode 100644 index 0000000..5392d8d --- /dev/null +++ b/SysBuild/network/sqwebmail @@ -0,0 +1,107 @@ +#!/bin/bash +#Framework, welches ein komplettes Linux System aus den Sourcen erstellt +#dieses Framework wird im CVS Repository +#:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt +# +#Lage dieser Datei im Archiv: $HeadURL: svn://www.compuextreme.de/Viitor/V962/ViitorMake/SysBuild/network/courier $ +# +#(c) 2003 Harald Kueller, Germany +#This program is free software; you can redistribute it and/or +#modify ist under the terms of the GNU General Public License +#as published by the Free Software Foundation; either version +#2 of the License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +#See the GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program; if not write to the Free Software Foundation, +#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines +#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk +#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können +#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden +#mk() umfasst die source Konfiguration und das Übersetzten des source +#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass +#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit +#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann +#vor der packeterstellung noch einiges am installationtree ändern. postmk +#läuft nachdem die Packetabhängigkeiten erstellt wurden. +#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden. +#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden +#erkannt: +# +# 1 : Package Erzeugung erzwingen. Packet wird, auch wenn es schon +# vorhanden ist, ohne weitere rückfragen neu Erzeugt. +# 2 : Package Installation erzwingen. Installpkg wird mit -f aufgerufen. +# Das bewirkt, das installpkg keine rückfragen bei der installation +# Stellt, und das packet in jedemfall (neu) installiert. +# 4 : Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt +# muss sich das Module selber um das Entpacken der sourcedateien kümmern. +# vor allem wichtig bei Packeten, für die es keine source.tgz gibt +# (z.B. aus dem CVS generierte Packete). +# 8 : Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei +# manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht +# aus dem Namen des sourcearchives ableiten lässt. Packet sollte in +# so einem Fall in der postmk() Funktion erstellt werden. +# 16 : Packet wird nicht installiert. Bei Packeten wie tar oder bash kann +# die installation mittelst installpkg probleme machen. +# 32 : Dependics File so erzeugen, das die Abhängigkeiten bei der installation +# erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden +# packeten die installation ab, und gibt nicht "nur" warnmeldungen aus. +# Wichtig bei packeten mit postinstallroutine, die software aus dem +# frisch installierten Packet verwendet (wie z.B. postgresql) +# 64 : sourcetree aufräumen nach packeterstellung unterbinden. +# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum +# kümmern + +#Module zur Erstellung des Packetes: +#Quelle der Source Archive: http://www.courier-mta.org +#Kurzbeschreibung: mail transfer agent +# +# +#Letzte Änderung von: $Author: kueller $ +#Datum der letzten Änderung: $Date: 2009-06-05 11:51:42 +0200 (Fr, 05 Jun 2009) $ +#Version der Datei: $Revision: 4794 $ +# +# + +SRCPATH=Network/Servers + +premk() { + echo "Nothing to do for premk()" +} + +mk() { + if [ "$MK64BIT" == "true" ]; then + ADDOPTIONS="--libdir=/opt/courier/lib64" + fi + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + LDFLAGS="-L/usr/lib64" \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET \ + --sysconfdir=/etc/courier \ + --disable-root-check \ + $ADDOPTIONS \ + --prefix=/opt/courier \ + --enable-cgibindir=/opt/apache2/cgi-bin \ + --enable-imagedir=/opt/apache2/htdocs + make -j $NUMCPU + make DESTDIR=$TMPROOT install + make install + make install-configure + mkdir -p $TMPROOT/etc/ + tar -C /etc/courier -cf - .|tar -C $TMPROOT/etc/courier -xvf - + make uninstall +} + +postmk() { + mkdir -p $TMPROOT/usr/share/doc/courier + cp INSTALL* $TMPROOT/usr/share/doc/courier + cp README* $TMPROOT/usr/share/doc/courier + tar cvf - `find | grep "\.html"` | tar xvf - -C $TMPROOT/usr/share/doc/courier +} diff --git a/SysBuild/network/udns b/SysBuild/network/udns index 55cdec2..e337a73 100644 --- a/SysBuild/network/udns +++ b/SysBuild/network/udns @@ -101,5 +101,6 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" + mkdir -p $TMPROOT/usr/include + cp udns.h $TMPROOT/usr/include } diff --git a/SysBuild/security/clamav b/SysBuild/security/clamav index a7e5e02..a9e3fee 100644 --- a/SysBuild/security/clamav +++ b/SysBuild/security/clamav @@ -86,6 +86,7 @@ mk32() { CC="gcc ${BUILDOPTIONS32}" \ CXX="g++ ${BUILDOPTIONS32}" \ USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/lib" \ ./configure --target=$TARGET32 \ --enable-id-check \ --sysconfdir=/etc/clamav \ @@ -95,6 +96,7 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install make distclean ClearHostSysNameing32 $TMPROOT + mv $TMPROOT/usr/bin/clamav-config{,-32} } mk() { @@ -126,5 +128,8 @@ postmk() { cp -a [A-Z]* $TMPROOT/usr/share/doc/clamav cp -a docs/html $TMPROOT/usr/share/doc/clamav cp -a contrib $TMPROOT/usr/share/doc/clamav - + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/clamav-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/clamav-config + fi } diff --git a/SysBuild/tools/nmap b/SysBuild/security/nmap similarity index 98% rename from SysBuild/tools/nmap rename to SysBuild/security/nmap index 138a7e7..2e61e7b 100644 --- a/SysBuild/tools/nmap +++ b/SysBuild/security/nmap @@ -69,15 +69,15 @@ # # -SRCPATH=Tools/Net +SRCPATH=Security/Net premk() { echo "Nothing to do for premk()" } mk() { - CC="/opt/gcc-3/bin/gcc" \ - CXX="/opt/gcc-3/bin/g++" \ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ ./configure --target=$TARGET \ --prefix=/usr make -j $NUMCPU diff --git a/SysBuild/xsys/docbook-xsl b/SysBuild/tools/docbook-xsl similarity index 99% rename from SysBuild/xsys/docbook-xsl rename to SysBuild/tools/docbook-xsl index bf11ad5..e816273 100644 --- a/SysBuild/xsys/docbook-xsl +++ b/SysBuild/tools/docbook-xsl @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=X11/Utilities +SRCPATH=Tools/Utilities #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= diff --git a/SysBuild/DebugModules/pdflib b/SysBuild/tools/pdflib similarity index 88% rename from SysBuild/DebugModules/pdflib rename to SysBuild/tools/pdflib index 694e761..bfad477 100644 --- a/SysBuild/DebugModules/pdflib +++ b/SysBuild/tools/pdflib @@ -82,33 +82,33 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ USE_ARCH=$UARCH \ - ./configure --target=$TARGET32 \ + LDFLAGS="-L/usr/lib" \ + ./configure --build=$TARGET32 \ --prefix=/usr/X11R7 \ --with-gnu-ld \ --enable-php \ --enable-cxx \ --with-perl=/usr/bin/perl \ --with-py=/usr/bin/python \ - --with-tcl=/usr/X11R7/bin/tclsh - CheckError "Configurescript failed !" 1 - make -j $NUMCPU - CheckError "Makeprocess failed !" 1 - make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install - CheckError "Make install process failed !" 1 + --with-tcl=/usr/X11R7/bin/tclsh && + make -j $NUMCPU LDEMULATION=elf_i386 && + make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install && make distclean mv $TMPROOT/usr/X11R7/bin/pdflib-config{,-32} + GenDynLib32 $TMPROOT/usr/X11R7/lib/libpdf.a 6.0.3 } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=\${prefix}/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/lib64" \ ./configure --host=$TARGET \ --build=$TARGET \ --target=$TARGET \ @@ -119,12 +119,10 @@ mk() { --enable-cxx \ --with-perl=/usr/bin/perl \ --with-py=/usr/bin/python \ - --with-tcl=/usr/X11R7/bin/tclsh - CheckError "Configurescript failed !" 1 - make -j $NUMCPU - CheckError "Makeprocess failed !" 1 - make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install - CheckError "Make install process failed !" 1 + --with-tcl=/usr/X11R7/bin/tclsh && + make -j $NUMCPU && + make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install && + GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libpdf.a 6.0.3 } postmk() { diff --git a/SysBuild/tools/sane-backends b/SysBuild/tools/sane-backends index 88d7b40..982bfd9 100644 --- a/SysBuild/tools/sane-backends +++ b/SysBuild/tools/sane-backends @@ -85,6 +85,7 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=$UARCH \ + LDFLAGS="-L/usr/lib" \ ./configure --host=$TARGET32 \ --prefix=/usr \ --sysconfdir=/etc/sysconfig && @@ -93,6 +94,7 @@ mk32() { sysconfdir=$TMPROOT/etc/sysconfig install CheckError "Make install process failed !" 1 make distclean + mv $TMPROOT/usr/bin/sane-config{,-32} } mk() { @@ -113,6 +115,8 @@ mk() { } postmk() { - echo "Nothing to do for postmk()" - CheckError "postmk() failed !" 1 + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/sane-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/sane-config + fi } diff --git a/SysBuild/tools/scrollkeeper b/SysBuild/tools/scrollkeeper index 8c4ee44..22dba2a 100644 --- a/SysBuild/tools/scrollkeeper +++ b/SysBuild/tools/scrollkeeper @@ -82,11 +82,11 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ LDFLAGS="-L/usr/lib -L/usr/X11R7/lib" \ USE_ARCH=$UARCH \ - ./configure --target=$TARGET32 \ + ./configure --build=$TARGET32 \ --prefix=/usr/X11R7 make -j $NUMCPU make -j $NUMCPU install @@ -94,22 +94,24 @@ mk32() { CheckError "Make install process failed !" 1 make distclean ClearHostSysNameing32 $TMPROOT + GenDynLib32 $TMPROOT/usr/X11R7/lib/libscrollkeeper.a 0.3.14 } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/X11R7/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ - ./configure --target=$TARGET \ + ./configure --build=$TARGET \ $ADDOPTIONS \ --prefix=/usr/X11R7 make -j $NUMCPU make -j $NUMCPU install make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 + GenDynLib $TMPROOT/usr/X11R7/$LIBDIR/libscrollkeeper.a 0.3.14 } postmk() {