Author: jue Date: 2006-02-23 19:11:11 +0100 (Thu, 23 Feb 2006) New Revision: 794 Added: crux-2.2/ports/opt/wvdial/wvdial-1.56.patch Removed: crux-2.2/ports/opt/wvdial/wvdial-1.55.patch Modified: crux-2.2/ports/opt/wvdial/Pkgfile Log: wvdial: update to 1.56 Modified: crux-2.2/ports/opt/wvdial/Pkgfile =================================================================== --- crux-2.2/ports/opt/wvdial/Pkgfile 2006-02-23 18:11:09 UTC (rev 793) +++ crux-2.2/ports/opt/wvdial/Pkgfile 2006-02-23 18:11:11 UTC (rev 794) @@ -4,7 +4,7 @@ # Depends on: ppp, openssl name=wvdial -version=1.55 +version=1.56 release=1 source=(http://open.nit.ca/download/$name-$version.tar.gz \ http://open.nit.ca/download/wvstreams-4.2.2.tar.gz \ @@ -14,7 +14,7 @@ cd wvstreams-4.2.2 ./configure --prefix=/usr \ --enable-verbose \ - --without-{bdb,qdbm,pam,tcl,telephony,swig,qt} + --without-{bdb,qdbm,pam,tcl,telephony,swig,qt,openslp} make ln -s ../xplc/include/xplc include/xplc Deleted: crux-2.2/ports/opt/wvdial/wvdial-1.55.patch =================================================================== --- crux-2.2/ports/opt/wvdial/wvdial-1.55.patch 2006-02-23 18:11:09 UTC (rev 793) +++ crux-2.2/ports/opt/wvdial/wvdial-1.55.patch 2006-02-23 18:11:11 UTC (rev 794) @@ -1,51 +0,0 @@ -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} Added: crux-2.2/ports/opt/wvdial/wvdial-1.56.patch =================================================================== --- crux-2.2/ports/opt/wvdial/wvdial-1.56.patch 2006-02-23 18:11:09 UTC (rev 793) +++ crux-2.2/ports/opt/wvdial/wvdial-1.56.patch 2006-02-23 18:11:11 UTC (rev 794) @@ -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}