[21064] trunk/dports/devel/aqbanking

source_changes at macosforge.org source_changes at macosforge.org
Thu Dec 28 14:07:54 PST 2006


Revision: 21064
          http://trac.macosforge.org/projects/macports/changeset/21064
Author:   mas at macports.org
Date:     2006-12-28 14:07:54 -0800 (Thu, 28 Dec 2006)

Log Message:
-----------
UPDATE: aqbanking 2.2.4

Modified Paths:
--------------
    trunk/dports/devel/aqbanking/Portfile
    trunk/dports/devel/aqbanking/files/qt3.patch

Added Paths:
-----------
    trunk/dports/devel/aqbanking/files/chipcard3.m4.patch

Removed Paths:
-------------
    trunk/dports/devel/aqbanking/files/aqbanking-2.2.0-qbcfg.patch

Modified: trunk/dports/devel/aqbanking/Portfile
===================================================================
--- trunk/dports/devel/aqbanking/Portfile	2006-12-28 21:32:33 UTC (rev 21063)
+++ trunk/dports/devel/aqbanking/Portfile	2006-12-28 22:07:54 UTC (rev 21064)
@@ -2,7 +2,7 @@
 
 PortSystem        1.0
 name              aqbanking
-version           2.2.3
+version           2.2.4
 revision	  0
 categories        devel net
 maintainers       mas at seligma.com
@@ -15,7 +15,7 @@
 		  is not available for OS X (upstream only has a Linux binary).
 homepage          http://www.aqbanking.de/
 master_sites      sourceforge
-checksums	  md5 875203b18dcc3ef1b591397d5381a4ca
+checksums	  md5 255c4a77e2bd25afe8a23f9ec153b354
 		  # unverified -- upstream does not publish signatures!
 depends_lib	  port:gwenhywfar \
 		  port:qt3 \
@@ -25,9 +25,9 @@
 		  port:automake
 
 patchfiles	  qt3.patch \
-		  aqbanking-2.2.0-qbcfg.patch
-			# both patches are still required in 2.2.3
+		  chipcard3.m4.patch
 			# upstream is notified!
+
 pre-configure {
 	system "cd ${worksrcpath} && aclocal -I m4"
 	system "cd ${worksrcpath} && autoconf"

Deleted: trunk/dports/devel/aqbanking/files/aqbanking-2.2.0-qbcfg.patch
===================================================================
--- trunk/dports/devel/aqbanking/files/aqbanking-2.2.0-qbcfg.patch	2006-12-28 21:32:33 UTC (rev 21063)
+++ trunk/dports/devel/aqbanking/files/aqbanking-2.2.0-qbcfg.patch	2006-12-28 22:07:54 UTC (rev 21064)
@@ -1,12 +0,0 @@
---- src/frontends/qbanking/lib/qbcfgmodule.cpp.orig	2006-04-03 21:30:30.000000000 +0200
-+++ src/frontends/qbanking/lib/qbcfgmodule.cpp	2006-10-30 08:08:55.000000000 +0100
-@@ -25,7 +25,8 @@
- QBCfgModule::QBCfgModule(QBanking *qb, const QString &name)
- :_qbanking(qb)
- ,_name(name)
--,_plugin(0){
-+,_plugin(0)
-+,_flags(0){
- 
- }
- 

Added: trunk/dports/devel/aqbanking/files/chipcard3.m4.patch
===================================================================
--- trunk/dports/devel/aqbanking/files/chipcard3.m4.patch	                        (rev 0)
+++ trunk/dports/devel/aqbanking/files/chipcard3.m4.patch	2006-12-28 22:07:54 UTC (rev 21064)
@@ -0,0 +1,250 @@
+--- m4/chipcard3.m4	1970-01-01 01:00:00.000000000 +0100
++++ m4/chipcard3.m4	2006-09-08 12:19:41.000000000 +0200
+@@ -0,0 +1,247 @@
++# $Id: chipcard3.m4 79 2005-05-31 22:50:34Z aquamaniac $
++# (c) 2004-2006 Martin Preuss<martin at libchipcard.de>
++# This function checks for chipcard3-client and chipcard3-server
++
++AC_DEFUN([AC_CHIPCARD3_CLIENT], [
++dnl searches for chipcard_client
++dnl Arguments: 
++dnl   $1: major version minimum
++dnl   $2: minor version minimum
++dnl   $3: patchlevel version minimum
++dnl   $4: build version minimum
++dnl Returns: chipcard_client_dir
++dnl          chipcard_client_datadir
++dnl          chipcard_client_libs
++dnl          chipcard_client_includes
++dnl          chipcard_client_servicelibs
++dnl          have_chipcard_client
++
++if test -z "$1"; then vma="0"; else vma="$1"; fi
++if test -z "$2"; then vmi="1"; else vmi="$2"; fi
++if test -z "$3"; then vpl="0"; else vpl="$3"; fi
++if test -z "$4"; then vbld="0"; else vbld="$4"; fi
++
++AC_MSG_CHECKING(if chipcard_client support desired)
++AC_ARG_ENABLE(chipcard-client,
++  [  --enable-chipcard-client      enable chipcard_client support (default=yes)],
++  enable_chipcard_client="$enableval",
++  enable_chipcard_client="yes")
++AC_MSG_RESULT($enable_chipcard_client)
++
++have_chipcard_client="no"
++chipcard_client_dir=""
++chipcard_client_datadir=""
++chipcard_client_libs=""
++chipcard_client_infolib=""
++chipcard_client_servicelibs=""
++chipcard_client_includes=""
++chipcard_client_servicedir=""
++if test "$enable_chipcard_client" != "no"; then
++  AC_MSG_CHECKING(for chipcard_client)
++  AC_ARG_WITH(chipcard-client-dir, [  --with-chipcard-client-dir=DIR
++                            uses chipcard_client from given dir],
++    [lcc_dir="$withval"],
++    [lcc_dir="${prefix} \
++	     /usr/local \
++             /usr \
++	     /chipcard-client \
++             /sw \
++             /"])
++
++  for li in $lcc_dir; do
++      if test -x "$li/bin/chipcard3-config"; then
++          chipcard_client_dir="$li";
++          break
++      fi
++  done
++  if test -z "$chipcard_client_dir"; then
++      AC_MSG_RESULT([not found ])
++      AC_MSG_ERROR([
++*** The library libchipcard3c was not found. Obtain it from 
++*** http://www.libchipcard.de.
++*** If it is already installed (including the -devel package), 
++*** you might need to specify the location with the 
++*** option --with-chipcard-client-dir=DIR.
++***
++*** Please note that it is not Libchipcard this package requested, it is the
++*** successor chipcard3.])
++  else
++      AC_MSG_RESULT($chipcard_client_dir)
++      AC_MSG_CHECKING(for chipcard-client libs)
++      chipcard_client_libs="`$chipcard_client_dir/bin/chipcard3-config --client-libs`"
++      AC_MSG_RESULT($chipcard_client_libs)
++      AC_MSG_CHECKING(for chipcard-client includes)
++      chipcard_client_includes="`$chipcard_client_dir/bin/chipcard3-config --includes`"
++      AC_MSG_RESULT($chipcard_client_includes)
++      AC_MSG_CHECKING(for chipcard-client datadir)
++      chipcard_client_datadir="`$chipcard_client_dir/bin/chipcard3-config --client-datadir`"
++      AC_MSG_RESULT($chipcard_client_datadir)
++      AC_MSG_CHECKING(for chipcard-client servicelib)
++      chipcard_client_servicelibs="`$chipcard_client_dir/bin/chipcard3-config --service-libs`"
++      AC_MSG_RESULT($chipcard_client_servicelibs)
++  fi
++  AC_MSG_CHECKING(if chipcard_client test desired)
++  AC_ARG_ENABLE(chipcard-client-test,
++    [  --enable-chipcard-client-test   enable chipcard_client-test (default=yes)],
++     enable_chipcard_client_test="$enableval",
++     enable_chipcard_client_test="yes")
++  AC_MSG_RESULT($enable_chipcard_client_test)
++  AC_MSG_CHECKING(for Chipcard-Client version >=$vma.$vmi.$vpl.$vbld)
++  if test "$enable_chipcard_client_test" != "no"; then
++    chipcard_client_versionstring="`$chipcard_client_dir/bin/chipcard3-config --vstring`.`$chipcard_client_dir/bin/chipcard3-config --vbuild`"
++    AC_MSG_RESULT([found $chipcard_client_versionstring])
++    if test "$vma" -gt "`$chipcard_client_dir/bin/chipcard3-config --vmajor`"; then
++      AC_MSG_ERROR([Your Chipcard-Client version is way too old.
++      Please update from http://sf.net/projects/libchipcard])
++    elif test "$vma" = "`$chipcard_client_dir/bin/chipcard3-config --vmajor`"; then
++      if test "$vmi" -gt "`$chipcard_client_dir/bin/chipcard3-config --vminor`"; then
++        AC_MSG_ERROR([Your Chipcard-Client version is too old.
++          Please update from http://sf.net/projects/libchipcard])
++      elif test "$vmi" = "`$chipcard_client_dir/bin/chipcard3-config --vminor`"; then
++          if test "$vpl" -gt "`$chipcard_client_dir/bin/chipcard3-config --vpatchlevel`"; then
++            AC_MSG_ERROR([Your Chipcard-Client version is a little bit too old.
++            Please update from http://sf.net/projects/libchipcard])
++          elif test "$vpl" = "`$chipcard_client_dir/bin/chipcard3-config --vpatchlevel`"; then
++            if test "$vbld" -gt "`$chipcard_client_dir/bin/chipcard3-config --vbuild`"; then
++              AC_MSG_ERROR([Your Chipcard-Client version is a little bit too old. 
++  Please update to the latest CVS version. Instructions for accessing 
++  CVS can be found on http://sf.net/projects/libchipcard])
++             fi
++           fi
++      fi
++    fi
++    have_chipcard_client="yes"
++    #AC_MSG_RESULT(yes)
++  else
++    have_chipcard_client="yes"
++    AC_MSG_RESULT(assuming yes)
++  fi
++dnl end of "if enable-chipcard-client"
++fi
++
++AC_SUBST(chipcard_client_dir)
++AC_SUBST(chipcard_client_datadir)
++AC_SUBST(chipcard_client_servicelibss)
++AC_SUBST(chipcard_client_libs)
++AC_SUBST(chipcard_client_includes)
++])
++
++
++
++
++
++AC_DEFUN([AC_CHIPCARD3_SERVER], [
++dnl searches for chipcard_server
++dnl Arguments: 
++dnl   $1: major version minimum
++dnl   $2: minor version minimum
++dnl   $3: patchlevel version minimum
++dnl   $4: build version minimum
++dnl Returns: chipcard_server_datadir
++dnl          chipcard_server_driverdir
++dnl          chipcard_server_servicedir
++dnl          have_chipcard_server
++
++if test -z "$1"; then vma="0"; else vma="$1"; fi
++if test -z "$2"; then vmi="1"; else vmi="$2"; fi
++if test -z "$3"; then vpl="0"; else vpl="$3"; fi
++if test -z "$4"; then vbld="0"; else vbld="$4"; fi
++
++AC_MSG_CHECKING(if chipcard_server support desired)
++AC_ARG_ENABLE(chipcard-server,
++  [  --enable-chipcard-server      enable chipcard_server support (default=yes)],
++  enable_chipcard_server="$enableval",
++  enable_chipcard_server="yes")
++AC_MSG_RESULT($enable_chipcard_server)
++
++have_chipcard_server="no"
++chipcard_server_dir=""
++chipcard_server_servicedir=""
++chipcard_server_driverdir=""
++chipcard_server_datadir=""
++if test "$enable_chipcard_server" != "no"; then
++  AC_MSG_CHECKING(for chipcard_server)
++  AC_ARG_WITH(chipcard-server-dir, [  --with-chipcard-server-dir=DIR
++                            uses chipcard_server from given dir],
++    [lcc_dir="$withval"],
++    [lcc_dir="${prefix} \
++	     /usr/local \
++             /usr \
++	     /chipcard-server \
++             /"])
++
++  for li in $lcc_dir; do
++      if test -x "$li/bin/chipcard3-config"; then
++          chipcard_server_dir="$li";
++          break
++      fi
++  done
++  if test -z "$chipcard_server_dir"; then
++      AC_MSG_RESULT([not found ])
++      AC_MSG_ERROR([
++*** The library libchipcard3s was not found. Obtain it from 
++*** http://www.libchipcard.de.
++*** If it is already installed (including the -devel package), 
++*** you might need to specify the location with the 
++*** option --with-chipcard-server-dir=DIR.
++***
++*** Please note that it is not Libchipcard this package requested, it is the
++*** successor chipcard3.])
++  else
++      AC_MSG_RESULT($chipcard_server_dir)
++      AC_MSG_CHECKING(for chipcard-server datadir)
++      chipcard_server_datadir="`$chipcard_server_dir/bin/chipcard3-config --server-datadir`"
++      AC_MSG_RESULT($chipcard_server_datadir)
++      AC_MSG_CHECKING(for chipcard-server driver dir)
++      chipcard_server_driverdir="`$chipcard_server_dir/bin/chipcard3-config --driverdir`"
++      AC_MSG_RESULT($chipcard_server_driverdir)
++      AC_MSG_CHECKING(for chipcard-server service dir)
++      chipcard_server_servicedir="`$chipcard_server_dir/bin/chipcard3-config --servicedir`"
++      AC_MSG_RESULT($chipcard_server_servicedir)
++
++  fi
++  AC_MSG_CHECKING(if chipcard_server test desired)
++  AC_ARG_ENABLE(chipcard-server-test,
++    [  --enable-chipcard-server-test   enable chipcard_server-test (default=yes)],
++     enable_chipcard_server_test="$enableval",
++     enable_chipcard_server_test="yes")
++  AC_MSG_RESULT($enable_chipcard_server_test)
++  AC_MSG_CHECKING(for Chipcard-Server version >=$vma.$vmi.$vpl.$vbld)
++  if test "$enable_chipcard_server_test" != "no"; then
++    chipcard_server_versionstring="`$chipcard_server_dir/bin/chipcard3-config --vstring`.`$chipcard_server_dir/bin/chipcard3-config --vbuild`"
++    AC_MSG_RESULT([found $chipcard_server_versionstring])
++    if test "$vma" -gt "`$chipcard_server_dir/bin/chipcard3-config --vmajor`"; then
++      AC_MSG_ERROR([Your Chipcard-Server version is way too old.
++      Please update from http://sf.net/projects/libchipcard])
++    elif test "$vma" = "`$chipcard_server_dir/bin/chipcard3-config --vmajor`"; then
++      if test "$vmi" -gt "`$chipcard_server_dir/bin/chipcard3-config --vminor`"; then
++        AC_MSG_ERROR([Your Chipcard-Server version is too old.
++          Please update from http://sf.net/projects/libchipcard])
++      elif test "$vmi" = "`$chipcard_server_dir/bin/chipcard3-config --vminor`"; then
++          if test "$vpl" -gt "`$chipcard_server_dir/bin/chipcard3-config --vpatchlevel`"; then
++            AC_MSG_ERROR([Your Chipcard-Server version is a little bit too old.
++            Please update from http://sf.net/projects/libchipcard])
++          elif test "$vpl" = "`$chipcard_server_dir/bin/chipcard3-config --vpatchlevel`"; then
++            if test "$vbld" -gt "`$chipcard_server_dir/bin/chipcard3-config --vbuild`"; then
++              AC_MSG_ERROR([Your Chipcard-Server version is a little bit too old. 
++  Please update to the latest CVS version. Instructions for accessing 
++  CVS can be found on http://sf.net/projects/libchipcard])
++             fi
++           fi
++      fi
++    fi
++    have_chipcard_server="yes"
++    #AC_MSG_RESULT(yes)
++  else
++    have_chipcard_server="yes"
++    AC_MSG_RESULT(assuming yes)
++  fi
++dnl end of "if enable-chipcard-server"
++fi
++
++AC_SUBST(chipcard_server_servicedir)
++AC_SUBST(chipcard_server_driverdir)
++AC_SUBST(chipcard_server_datadir)
++])
++
++

Modified: trunk/dports/devel/aqbanking/files/qt3.patch
===================================================================
--- trunk/dports/devel/aqbanking/files/qt3.patch	2006-12-28 21:32:33 UTC (rev 21063)
+++ trunk/dports/devel/aqbanking/files/qt3.patch	2006-12-28 22:07:54 UTC (rev 21064)
@@ -1,30 +1,11 @@
---- m4/os.m4	2006-04-03 21:29:43.000000000 +0200
-+++ m4/os.m4	2006-08-08 21:46:25.000000000 +0200
-@@ -42,6 +42,11 @@
- 	AC_DEFINE(OS_BEOS,1,[if BeOS is used])
- 	OS_TYPE="posix"
- 	;;
-+    *-darwin*)
-+	OSYSTEM="darwin"
-+	AC_DEFINE(OS_DARWIN,1,[if Darwin is used])
-+	OS_TYPE="posix"
-+	;;
-     *-win32*)
-     	OSYSTEM="windows"
- 	AC_DEFINE(OS_WIN32,1,[if WIN32 is used])
-diff -ruN aqbanking-2.2.0/m4/qt3.m4 aqbanking-2.2.0-new/m4/qt3.m4
---- m4/qt3.m4	2006-04-03 21:29:43.000000000 +0200
-+++ m4/qt3.m4	2006-08-08 21:47:36.000000000 +0200
-@@ -149,7 +149,11 @@
+--- m4/qt3.m4	2006-10-30 13:58:28.000000000 +0100
++++ m4/qt3.m4	2006-12-28 21:46:51.000000000 +0100
+@@ -149,7 +149,7 @@
  fi
  
  # This is the name of the qt library to search for.
--qt_searchname="lib${qt_libname}${std_shrext}.3"
-+if test `uname -s` = "Darwin"; then
-+   qt_searchname="lib${qt_libname}.3.dylib"
-+else
-+   qt_searchname="lib${qt_libname}${std_shrext}.3"
-+fi
- 
- if test -z "$qt3_libs"; then
-    AQ_SEARCH_FOR_PATH([$qt_searchname],[$local_qt3_libs])
+-if test "x$OSYSTEM" = "xDarwin"; then
++if test x`uname -s` = xDarwin; then
+    qt_searchname="lib${qt_libname}.3.dylib"
+ else
+    qt_searchname="lib${qt_libname}${std_shrext}.3"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061228/ceb6fff9/attachment.html


More information about the macports-changes mailing list