February 2006 - crux-commits

r724 - crux-2.1/ports/opt/k3b
by crux＠crux.nu 16 Feb '06

16 Feb '06

Author: sten Date: 2006-02-16 10:27:25 +0100 (Thu, 16 Feb 2006) New Revision: 724 Modified: crux-2.1/ports/opt/k3b/.md5sum crux-2.1/ports/opt/k3b/Pkgfile Log: k3b: update to 0.12.12 Modified: crux-2.1/ports/opt/k3b/.md5sum =================================================================== --- crux-2.1/ports/opt/k3b/.md5sum 2006-02-16 00:05:03 UTC (rev 723) +++ crux-2.1/ports/opt/k3b/.md5sum 2006-02-16 09:27:25 UTC (rev 724) @@ -1 +1 @@ -17fd99200517d794b206228e3f87c528 k3b-0.12.11.tar.bz2 +75257fa05bfc5504a07d12959cdc6342 k3b-0.12.12.tar.bz2 Modified: crux-2.1/ports/opt/k3b/Pkgfile =================================================================== --- crux-2.1/ports/opt/k3b/Pkgfile 2006-02-16 00:05:03 UTC (rev 723) +++ crux-2.1/ports/opt/k3b/Pkgfile 2006-02-16 09:27:25 UTC (rev 724) @@ -5,7 +5,7 @@ # Depends on: kdelibs, cdrtools, cdparanoia, cdrdao, taglib, flac, normalize, dvd+rw-tools, lame, libsndfile, ffmpeg, libmusicbrainz name=k3b -version=0.12.11 +version=0.12.12 release=1 source=(http://dl.sourceforge.net/sourceforge/k3b/$name-$version.tar.bz2)

1 0

r723 - in crux-2.1/ports/opt: opera opera-static
by crux＠crux.nu 16 Feb '06

16 Feb '06

Author: jheino Date: 2006-02-16 01:05:03 +0100 (Thu, 16 Feb 2006) New Revision: 723 Modified: crux-2.1/ports/opt/opera-static/.footprint crux-2.1/ports/opt/opera-static/.md5sum crux-2.1/ports/opt/opera-static/Pkgfile crux-2.1/ports/opt/opera/.footprint crux-2.1/ports/opt/opera/.md5sum crux-2.1/ports/opt/opera/Pkgfile Log: opera-static: updated to version 8.52-20060201.1 opera: updated to version opera-8.52-20060201.6 Modified: crux-2.1/ports/opt/opera/.footprint =================================================================== --- crux-2.1/ports/opt/opera/.footprint 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera/.footprint 2006-02-16 00:05:03 UTC (rev 723) @@ -6,11 +6,11 @@ -rwxr-xr-x root/root usr/bin/opera drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/opera/ -drwxr-xr-x root/root usr/lib/opera/8.51-20051114.6/ --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.6/missingsyms.so --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.6/opera --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.6/spellcheck.so --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.6/works +drwxr-xr-x root/root usr/lib/opera/8.52-20060201.6/ +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.6/missingsyms.so +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.6/opera +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.6/spellcheck.so +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.6/works drwxr-xr-x root/root usr/lib/opera/plugins/ -rwxr-xr-x root/root usr/lib/opera/plugins/libnpp.so -rwxr-xr-x root/root usr/lib/opera/plugins/operamotifwrapper-2 Modified: crux-2.1/ports/opt/opera/.md5sum =================================================================== --- crux-2.1/ports/opt/opera/.md5sum 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera/.md5sum 2006-02-16 00:05:03 UTC (rev 723) @@ -1 +1 @@ -bf930c45023035ee4258b13b707176c2 opera-8.51-20051114.6-shared-qt.i386-en.tar.bz2 +f443ca0b6dffb6cedabf9adc54a370dd opera-8.52-20060201.6-shared-qt.i386-en.tar.bz2 Modified: crux-2.1/ports/opt/opera/Pkgfile =================================================================== --- crux-2.1/ports/opt/opera/Pkgfile 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera/Pkgfile 2006-02-16 00:05:03 UTC (rev 723) @@ -5,9 +5,9 @@ # Depends on: qt3 name=opera -version=8.51-20051114.6 +version=8.52-20060201.6 release=1 -source=(http://$name.nsc.no/linux/851/final/en/i386/$name-$version-shared-qt.i386-en.tar.bz2) +source=(http://$name.nsc.no/linux/852/final/en/i386/shared/$name-$version-shared-qt.i386-en.tar.bz2) build() { cd $name-$version-shared-qt.i386-en Modified: crux-2.1/ports/opt/opera-static/.footprint =================================================================== --- crux-2.1/ports/opt/opera-static/.footprint 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera-static/.footprint 2006-02-16 00:05:03 UTC (rev 723) @@ -6,11 +6,11 @@ -rwxr-xr-x root/root usr/bin/opera drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/opera/ -drwxr-xr-x root/root usr/lib/opera/8.51-20051114.1/ --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.1/missingsyms.so --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.1/opera --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.1/spellcheck.so --rwxr-xr-x root/root usr/lib/opera/8.51-20051114.1/works +drwxr-xr-x root/root usr/lib/opera/8.52-20060201.1/ +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.1/missingsyms.so +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.1/opera +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.1/spellcheck.so +-rwxr-xr-x root/root usr/lib/opera/8.52-20060201.1/works drwxr-xr-x root/root usr/lib/opera/plugins/ -rwxr-xr-x root/root usr/lib/opera/plugins/libnpp.so -rwxr-xr-x root/root usr/lib/opera/plugins/operamotifwrapper-1 Modified: crux-2.1/ports/opt/opera-static/.md5sum =================================================================== --- crux-2.1/ports/opt/opera-static/.md5sum 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera-static/.md5sum 2006-02-16 00:05:03 UTC (rev 723) @@ -1 +1 @@ -bd6bd9cfaf13b6509c8531d02a4c51a2 opera-8.51-20051114.1-static-qt.i386-en.tar.bz2 +e051ee0f78dbf7fac407fad147e02d8b opera-8.52-20060201.1-static-qt.i386-en.tar.bz2 Modified: crux-2.1/ports/opt/opera-static/Pkgfile =================================================================== --- crux-2.1/ports/opt/opera-static/Pkgfile 2006-02-15 21:21:03 UTC (rev 722) +++ crux-2.1/ports/opt/opera-static/Pkgfile 2006-02-16 00:05:03 UTC (rev 723) @@ -5,9 +5,9 @@ # Depends on: x11 name=opera-static -version=8.51-20051114.1 +version=8.52-20060201.1 release=1 -source=(http://opera.nsc.no/linux/851/final/en/i386/opera-$version-static-qt.i386-en.tar.bz2) +source=(http://opera.nsc.no/linux/852/final/en/i386/static/opera-$version-static-qt.i386-en.tar.bz2) build() { cd opera-$version-static-qt.i386-en

1 0

r722 - crux-2.1/ports/opt/quilt
by crux＠crux.nu 15 Feb '06

15 Feb '06

Author: tilman Date: 2006-02-15 22:21:03 +0100 (Wed, 15 Feb 2006) New Revision: 722 Modified: crux-2.1/ports/opt/quilt/.md5sum crux-2.1/ports/opt/quilt/Pkgfile Log: quilt: updated to 0.44 Modified: crux-2.1/ports/opt/quilt/.md5sum =================================================================== --- crux-2.1/ports/opt/quilt/.md5sum 2006-02-15 21:17:03 UTC (rev 721) +++ crux-2.1/ports/opt/quilt/.md5sum 2006-02-15 21:21:03 UTC (rev 722) @@ -1,2 +1,2 @@ -a0bed88a3dbc0d2f25659bf9077c2515 quilt-0.43.tar.gz +90ec3740a590d86af40f81792885f446 quilt-0.44.tar.gz f7dbfd08ce95370c3005c2de45fb800c quilt.diff Modified: crux-2.1/ports/opt/quilt/Pkgfile =================================================================== --- crux-2.1/ports/opt/quilt/Pkgfile 2006-02-15 21:17:03 UTC (rev 721) +++ crux-2.1/ports/opt/quilt/Pkgfile 2006-02-15 21:21:03 UTC (rev 722) @@ -4,7 +4,7 @@ # Depends on: diffstat name=quilt -version=0.43 +version=0.44 release=1 source=(http://download.savannah.nongnu.org/releases/$name/$name-$version.t… \ $name.diff)

1 0

r721 - crux-2.1/ports/opt/git
by crux＠crux.nu 15 Feb '06

15 Feb '06

Author: tilman Date: 2006-02-15 22:17:03 +0100 (Wed, 15 Feb 2006) New Revision: 721 Modified: crux-2.1/ports/opt/git/.footprint crux-2.1/ports/opt/git/.md5sum crux-2.1/ports/opt/git/Pkgfile Log: git: updated to 1.2.0 Modified: crux-2.1/ports/opt/git/.footprint =================================================================== --- crux-2.1/ports/opt/git/.footprint 2006-02-14 20:41:39 UTC (rev 720) +++ crux-2.1/ports/opt/git/.footprint 2006-02-15 21:17:03 UTC (rev 721) @@ -78,6 +78,7 @@ -rwxr-xr-x root/root usr/bin/git-repack -rwxr-xr-x root/root usr/bin/git-repo-config -rwxr-xr-x root/root usr/bin/git-request-pull +-rwxr-xr-x root/root usr/bin/git-rerere -rwxr-xr-x root/root usr/bin/git-reset -rwxr-xr-x root/root usr/bin/git-resolve -rwxr-xr-x root/root usr/bin/git-rev-list @@ -87,6 +88,7 @@ -rwxr-xr-x root/root usr/bin/git-sh-setup -rwxr-xr-x root/root usr/bin/git-shell -rwxr-xr-x root/root usr/bin/git-shortlog +-rwxr-xr-x root/root usr/bin/git-show -rwxr-xr-x root/root usr/bin/git-show-branch -rwxr-xr-x root/root usr/bin/git-show-index -rwxr-xr-x root/root usr/bin/git-ssh-fetch Modified: crux-2.1/ports/opt/git/.md5sum =================================================================== --- crux-2.1/ports/opt/git/.md5sum 2006-02-14 20:41:39 UTC (rev 720) +++ crux-2.1/ports/opt/git/.md5sum 2006-02-15 21:17:03 UTC (rev 721) @@ -1 +1 @@ -9c664d5b5dc9111fc5312c568b907f0c git-1.1.6.tar.bz2 +b3c1d3bdd1e45fd2b25f425e988b4959 git-1.2.0.tar.bz2 Modified: crux-2.1/ports/opt/git/Pkgfile =================================================================== --- crux-2.1/ports/opt/git/Pkgfile 2006-02-14 20:41:39 UTC (rev 720) +++ crux-2.1/ports/opt/git/Pkgfile 2006-02-15 21:17:03 UTC (rev 721) @@ -4,7 +4,7 @@ # Depends on: openssl name=git -version=1.1.6 +version=1.2.0 release=1 source=(http://www.kernel.org/pub/software/scm/$name/$name-$version.tar.bz2)

1 0

r720 - crux-2.1/ports/opt/x11vnc
by crux＠crux.nu 14 Feb '06

14 Feb '06

Author: jheino Date: 2006-02-14 21:41:39 +0100 (Tue, 14 Feb 2006) New Revision: 720 Modified: crux-2.1/ports/opt/x11vnc/.md5sum crux-2.1/ports/opt/x11vnc/Pkgfile Log: x11vnc: updated to version 0.8 Modified: crux-2.1/ports/opt/x11vnc/.md5sum =================================================================== --- crux-2.1/ports/opt/x11vnc/.md5sum 2006-02-13 20:59:35 UTC (rev 719) +++ crux-2.1/ports/opt/x11vnc/.md5sum 2006-02-14 20:41:39 UTC (rev 720) @@ -1 +1 @@ -61b4b21b31aca5c87c21d88efaf7dc50 x11vnc-0.7.2.tar.gz +9a8ea2d9c6face2c3da0bdbce852ebbd x11vnc-0.8.tar.gz Modified: crux-2.1/ports/opt/x11vnc/Pkgfile =================================================================== --- crux-2.1/ports/opt/x11vnc/Pkgfile 2006-02-13 20:59:35 UTC (rev 719) +++ crux-2.1/ports/opt/x11vnc/Pkgfile 2006-02-14 20:41:39 UTC (rev 720) @@ -5,7 +5,7 @@ # Depends on: x11 name=x11vnc -version=0.7.2 +version=0.8 release=1 source=(http://www.karlrunge.com/$name/$name-$version.tar.gz)

1 0

r719 - crux-2.1/ports/opt/udev
by crux＠crux.nu 13 Feb '06

13 Feb '06

Author: jaeger Date: 2006-02-13 21:59:35 +0100 (Mon, 13 Feb 2006) New Revision: 719 Modified: crux-2.1/ports/opt/udev/devfs_to_udev_README Log: udev: removed broken link to the old cruxhints wiki and added a note to devfs_to_udev_README that it is outdated Modified: crux-2.1/ports/opt/udev/devfs_to_udev_README =================================================================== --- crux-2.1/ports/opt/udev/devfs_to_udev_README 2006-02-13 16:55:01 UTC (rev 718) +++ crux-2.1/ports/opt/udev/devfs_to_udev_README 2006-02-13 20:59:35 UTC (rev 719) @@ -1,5 +1,8 @@ +*** Use the README instead, this file is outdated. *** + + README for udev @@ -83,7 +86,3 @@ _________________________________________________________________ -References - - 1. http://sto.f2o.org/crux/wiki/UdevHint -

1 0

r718 - crux-2.1/ports/opt/whois
by crux＠crux.nu 13 Feb '06

13 Feb '06

Author: jue Date: 2006-02-13 17:55:01 +0100 (Mon, 13 Feb 2006) New Revision: 718 Modified: crux-2.1/ports/opt/whois/.md5sum crux-2.1/ports/opt/whois/Pkgfile Log: whois: update to 4.7.12 Modified: crux-2.1/ports/opt/whois/.md5sum =================================================================== --- crux-2.1/ports/opt/whois/.md5sum 2006-02-13 16:54:29 UTC (rev 717) +++ crux-2.1/ports/opt/whois/.md5sum 2006-02-13 16:55:01 UTC (rev 718) @@ -1 +1 @@ -aca7ac4c907232f2eea5e7cbb7d6245d whois_4.7.11.tar.gz +31df01aa34c5dacaf0ddee5e50744077 whois_4.7.12.tar.gz Modified: crux-2.1/ports/opt/whois/Pkgfile =================================================================== --- crux-2.1/ports/opt/whois/Pkgfile 2006-02-13 16:54:29 UTC (rev 717) +++ crux-2.1/ports/opt/whois/Pkgfile 2006-02-13 16:55:01 UTC (rev 718) @@ -5,7 +5,7 @@ # Depends on: name=whois -version=4.7.11 +version=4.7.12 release=1 source=(http://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.…

1 0

r717 - crux-2.1/ports/opt/sylpheed
by crux＠crux.nu 13 Feb '06

13 Feb '06

Author: jue Date: 2006-02-13 17:54:29 +0100 (Mon, 13 Feb 2006) New Revision: 717 Modified: crux-2.1/ports/opt/sylpheed/.md5sum crux-2.1/ports/opt/sylpheed/Pkgfile Log: sylpheed: update to 2.2.0 Modified: crux-2.1/ports/opt/sylpheed/.md5sum =================================================================== --- crux-2.1/ports/opt/sylpheed/.md5sum 2006-02-13 16:53:47 UTC (rev 716) +++ crux-2.1/ports/opt/sylpheed/.md5sum 2006-02-13 16:54:29 UTC (rev 717) @@ -1 +1 @@ -c9f1c4cf2b3933ebbb58519ba3b77887 sylpheed-2.0.4.tar.bz2 +da23e5c6ef869c4fe847ea9207f40ddf sylpheed-2.2.0.tar.bz2 Modified: crux-2.1/ports/opt/sylpheed/Pkgfile =================================================================== --- crux-2.1/ports/opt/sylpheed/Pkgfile 2006-02-13 16:53:47 UTC (rev 716) +++ crux-2.1/ports/opt/sylpheed/Pkgfile 2006-02-13 16:54:29 UTC (rev 717) @@ -4,9 +4,9 @@ # Depends on: gtk, openssl name=sylpheed -version=2.0.4 +version=2.2.0 release=1 -source=(http://sylpheed.good-day.net/sylpheed/v2.0/$name-$version.tar.bz2) +source=(http://sylpheed.good-day.net/sylpheed/v2.2/$name-$version.tar.bz2) build () { cd $name-$version

1 0

r716 - crux-2.1/ports/opt/iftop
by crux＠crux.nu 13 Feb '06

13 Feb '06

Author: jue Date: 2006-02-13 17:53:47 +0100 (Mon, 13 Feb 2006) New Revision: 716 Modified: crux-2.1/ports/opt/iftop/.md5sum crux-2.1/ports/opt/iftop/Pkgfile Log: iftop: update to 0.17 Modified: crux-2.1/ports/opt/iftop/.md5sum =================================================================== --- crux-2.1/ports/opt/iftop/.md5sum 2006-02-13 16:44:26 UTC (rev 715) +++ crux-2.1/ports/opt/iftop/.md5sum 2006-02-13 16:53:47 UTC (rev 716) @@ -1 +1 @@ -e24a6b444858ab72afc414376d28b966 iftop-0.16.tar.gz +062bc8fb3856580319857326e0b8752d iftop-0.17.tar.gz Modified: crux-2.1/ports/opt/iftop/Pkgfile =================================================================== --- crux-2.1/ports/opt/iftop/Pkgfile 2006-02-13 16:44:26 UTC (rev 715) +++ crux-2.1/ports/opt/iftop/Pkgfile 2006-02-13 16:53:47 UTC (rev 716) @@ -4,7 +4,7 @@ # Depends on: libpcap, ncurses name=iftop -version=0.16 +version=0.17 release=1 source=(http://www.ex-parrot.com/~pdw/iftop/download/$name-$version.tar.gz)

1 0

r715 - crux-2.1/ports/core/wvdial
by crux＠crux.nu 13 Feb '06

13 Feb '06

Author: jue Date: 2006-02-13 17:44:26 +0100 (Mon, 13 Feb 2006) New Revision: 715 Added: crux-2.1/ports/core/wvdial/wvdial-1.55.patch Removed: crux-2.1/ports/core/wvdial/wvdial-1.54.0.patch Modified: crux-2.1/ports/core/wvdial/.md5sum crux-2.1/ports/core/wvdial/Pkgfile Log: wvdial: update to 1.55 Modified: crux-2.1/ports/core/wvdial/.md5sum =================================================================== --- crux-2.1/ports/core/wvdial/.md5sum 2006-02-13 08:22:28 UTC (rev 714) +++ crux-2.1/ports/core/wvdial/.md5sum 2006-02-13 16:44:26 UTC (rev 715) @@ -1,3 +1,3 @@ -8267735714a3219bde4b831044ebf4db wvdial-1.54.0.patch -8648c044305fc66ee33ecc55d36f8c8b wvdial-1.54.0.tar.gz -ecb4e74ebaa1f45206f5d88eb34c5623 wvstreams-4.0.2.tar.gz +d084772c96db6c52371e36b29d95f332 wvdial-1.55.patch +747b135ca909129a14c777cf53ed3df0 wvdial-1.55.tar.gz +103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz Modified: crux-2.1/ports/core/wvdial/Pkgfile =================================================================== --- crux-2.1/ports/core/wvdial/Pkgfile 2006-02-13 08:22:28 UTC (rev 714) +++ crux-2.1/ports/core/wvdial/Pkgfile 2006-02-13 16:44:26 UTC (rev 715) @@ -4,20 +4,22 @@ # Depends on: ppp, openssl name=wvdial -version=1.54.0 -release=2 +version=1.55 +release=1 source=(http://open.nit.ca/download/$name-$version.tar.gz \ - http://www.csclub.uwaterloo.ca/~ja2morri/wvstreams-4.0.2.tar.gz \ + http://open.nit.ca/download/wvstreams-4.2.2.tar.gz \ $name-$version.patch) build() { - cd wvstreams-4.0.2 - ./configure --prefix=/usr --enable-verbose + cd wvstreams-4.2.2 + ./configure --prefix=/usr \ + --enable-verbose \ + --without-{bdb,qdbm,pam,tcl,telephony,swig,qt} make ln -s ../xplc/include/xplc include/xplc cd $SRC/$name-$version patch -p1 < $SRC/$name-$version.patch - make CXXOPTS="$CXXFLAGS" WVS=$SRC/wvstreams-4.0.2 + make CXXOPTS="$CXXFLAGS" WVS=$SRC/wvstreams-4.2.2 make DESTDIR=$PKG install } Deleted: crux-2.1/ports/core/wvdial/wvdial-1.54.0.patch =================================================================== --- crux-2.1/ports/core/wvdial/wvdial-1.54.0.patch 2006-02-13 08:22:28 UTC (rev 714) +++ crux-2.1/ports/core/wvdial/wvdial-1.54.0.patch 2006-02-13 16:44:26 UTC (rev 715) @@ -1,34 +0,0 @@ -diff -Nru wvdial-1.54.0.orig/Makefile wvdial-1.54.0/Makefile ---- wvdial-1.54.0.orig/Makefile 2005-05-09 19:21:39.000000000 +0200 -+++ wvdial-1.54.0/Makefile 2005-05-09 19:52:18.000000000 +0200 -@@ -1,15 +1,17 @@ - ifeq ($(TOPDIR),) - TOPDIR=. -- PKGINC=/usr/include/wvstreams /usr/local/include/wvstreams -+ PKGINC=$(WVS)/include - LIBS := $(LIBS) \ - $(shell $(CC) -lsupc++ 2>&1 | grep -q "undefined reference" \ - && echo " -lsupc++") - endif - --PREFIX=/usr/local -+PREFIX=$(DESTDIR)/usr - BINDIR=${PREFIX}/bin --MANDIR=${PREFIX}/share/man --PPPDIR=/etc/ppp/peers -+MANDIR=${PREFIX}/man -+PPPDIR=$(DESTDIR)/etc/ppp/peers -+ -+VERBOSE=1 - - include $(TOPDIR)/wvrules.mk - -@@ -21,7 +23,7 @@ - wvdial.a: wvdialer.o wvdialtext.o wvmodemscan.o wvpapchap.o wvdialbrain.o \ - wvdialmon.o - --LIBS += -L../wvstreams -lwvutils -lwvstreams -+LIBS += $(WVS)/libwvstreams.a $(WVS)/libwvutils.a $(WVS)/libwvbase.a $(WVS)/xplc/libxplc-cxx.a - - wvdial wvdialconf papchaptest pppmon: wvdial.a - Added: crux-2.1/ports/core/wvdial/wvdial-1.55.patch =================================================================== --- crux-2.1/ports/core/wvdial/wvdial-1.55.patch 2006-02-13 08:22:28 UTC (rev 714) +++ crux-2.1/ports/core/wvdial/wvdial-1.55.patch 2006-02-13 16:44:26 UTC (rev 715) @@ -0,0 +1,51 @@ +diff -Nru wvdial-1.55.orig/Makefile wvdial-1.55/Makefile +--- wvdial-1.55.orig/Makefile 2006-02-12 19:22:27.000000000 +0100 ++++ wvdial-1.55/Makefile 2006-02-12 20:55:49.000000000 +0100 +@@ -1,30 +1,22 @@ + ifeq ($(TOPDIR),) + TOPDIR=. + +- prefix=/usr/local +- WVSTREAMS_INC= +- WVSTREAMS_LIB= ++ prefix=$(DESTDIR)/usr ++ WVSTREAMS_INC=$(WVS)/include ++ WVSTREAMS_LIB=$(WVS) + WVSTREAMS_BIN=$(prefix)/bin + WVSTREAMS_SRC=. + +- PC_CFLAGS=$(shell pkg-config --cflags libwvstreams) +- ifeq ($(PC_CFLAGS),) +- $(error WvStreams does not appear to be installed) +- endif +- CPPFLAGS+=$(PC_CFLAGS) +- +- PC_LIBS=$(shell pkg-config --libs libwvstreams) +- ifeq ($(PC_LIBS),) +- $(error WvStreams does not appear to be installed) +- endif +- LIBS+=$(PC_LIBS) ++ LIBS = $(WVS)/libuniconf.a $(WVS)/libwvstreams.a $(WVS)/libwvutils.a $(WVS)/libwvbase.a $(WVS)/xplc/libxplc-cxx.a -lcrypto -lssl + else + XPATH=$(TOPDIR)/src + endif + + BINDIR=${prefix}/bin +-MANDIR=${prefix}/share/man +-PPPDIR=/etc/ppp/peers ++MANDIR=${prefix}/man ++PPPDIR=$(DESTDIR)/etc/ppp/peers ++ ++VERBOSE=1 + + include $(TOPDIR)/wvrules.mk + +@@ -38,7 +30,7 @@ + ifeq ($(WVSTREAMS_LIB),) + LIBUNICONF:=-luniconf + endif +-wvdial wvdialconf papchaptest pppmon: wvdial.a $(LIBUNICONF) ++wvdial wvdialconf papchaptest pppmon: wvdial.a + + install-bin: all + [ -d ${BINDIR} ] || install -d ${BINDIR}

1 0