From c0870c45c1543ff4a692227e4df19883dfcb4dac Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 19 Nov 2014 00:50:34 -0500 Subject: libre/non-working/isdnutils-dfsg: it compiles! --- libre/non-working/isdnutils-dfsg/PKGBUILD | 4 +- .../isdnutils-dfsg/modern-autoconf.patch | 72 ++++++++++++---------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/libre/non-working/isdnutils-dfsg/PKGBUILD b/libre/non-working/isdnutils-dfsg/PKGBUILD index efa472292..1ff0b451a 100644 --- a/libre/non-working/isdnutils-dfsg/PKGBUILD +++ b/libre/non-working/isdnutils-dfsg/PKGBUILD @@ -28,7 +28,7 @@ noextract=("${source[@]##*/}") md5sums=('19d43212c307d30db9dad2413e84374b' '38841f0c697d49fd71ff91e9188f6d4c' '68b901c1553771bcef9a9297a93c4a46' - 'a9966745e46ac479cf89f1368bc28141') + '9fa4158b19d5c9b774d14af34767ef1b') # Package meta-data pkgrel=1 @@ -55,9 +55,7 @@ prepare() { cd "$srcdir"/$pkgname-$pkgver find . -name configure.in -execdir mv {} configure.ac \; - patch -p1 -i ../modern-autoconf.patch - ( set -o pipefail find * -name configure.ac -printf '%h\n' | diff --git a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch b/libre/non-working/isdnutils-dfsg/modern-autoconf.patch index ac3ec9596..f80f34f54 100644 --- a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch +++ b/libre/non-working/isdnutils-dfsg/modern-autoconf.patch @@ -1,6 +1,6 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/Makefile isdnutils-dfsg-3.25.1.3.5/Makefile ---- isdnutils-dfsg-3.25.1.3.5.orig/Makefile 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/Makefile 2014-11-19 00:18:07.084965587 -0500 +--- isdnutils-dfsg-3.25.1.3.5.orig/Makefile 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/Makefile 2014-11-19 00:41:00.452734610 -0500 @@ -53,10 +53,10 @@ endif @@ -15,8 +15,8 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/Makefile isdnutils-dfsg-3.25.1.3.5/Makef endif diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac 2014-11-19 00:14:25.926235549 -0500 +--- isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capi20/configure.ac 2014-11-19 00:41:00.452734610 -0500 @@ -1,7 +1,10 @@ dnl Process this file with autoconf to produce a configure script. @@ -38,20 +38,23 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capi20/configure.ac isdnutils-dfsg-3.25. AC_SUBST(BUILD) diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am 2014-11-19 00:14:25.926235549 -0500 -@@ -7,7 +7,7 @@ +--- isdnutils-dfsg-3.25.1.3.5.orig/capifax/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capifax/Makefile.am 2014-11-19 00:42:07.217978987 -0500 +@@ -7,9 +7,9 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ stamp-h.in -INCLUDES = $(all_includes) -+AM_CPPFLAGS = $(all_includes) ++AM_CPPFLAGS = -I../capi20 $(all_includes) CFLAGS = -Wall -O2 - LDFLAGS = $(all_libraries) +-LDFLAGS = $(all_libraries) ++LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) LDADD = -lcapi20 + + bin_PROGRAMS = capifax capifaxrcvd diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capifax/configure.ac 2014-11-19 00:41:00.456067872 -0500 @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(capifax.c) @@ -63,8 +66,8 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capifax/configure.ac isdnutils-dfsg-3.25 CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am 2014-11-19 00:16:24.333768824 -0500 +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinfo/Makefile.am 2014-11-19 00:41:00.456067872 -0500 @@ -7,9 +7,9 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ stamp-h.in comperr @@ -78,8 +81,8 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/Makefile.am isdnutils-dfsg-3.25 bin_PROGRAMS = capiinfo diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac ---- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac 2014-11-19 00:14:25.926235549 -0500 +--- isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinfo/configure.ac 2014-11-19 00:41:00.456067872 -0500 @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(capiinfo.c) @@ -92,7 +95,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinfo/configure.ac isdnutils-dfsg-3.2 I4LCONFDIR=`eval echo ${CONFIG_I4LCONFDIR:-"/etc/isdn"}` diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am --- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinit/Makefile.am 2014-11-19 00:41:00.456067872 -0500 @@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ stamp-h.in comperr core @@ -104,7 +107,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/Makefile.am isdnutils-dfsg-3.25 LDADD = diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/capiinit/configure.ac 2014-11-19 00:41:00.456067872 -0500 @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(capiinit.c) @@ -117,7 +120,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/capiinit/configure.ac isdnutils-dfsg-3.2 CONFIG_SBINDIR$=${CONFIG_CARD_SBINDIR:-"/sbin"} diff -ru isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac isdnutils-dfsg-3.25.1.3.5/imon/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/imon/configure.ac 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/imon/configure.ac 2014-11-19 00:41:00.459401135 -0500 @@ -4,8 +4,8 @@ AC_PREFIX_DEFAULT(/usr) @@ -148,7 +151,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/imon/configure.ac isdnutils-dfsg-3.25.1. AC_SUBST(INSTALL) diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnctrl/configure.ac 2014-11-19 00:41:00.459401135 -0500 @@ -30,21 +30,21 @@ AC_ARG_WITH(sbin, [ --with-sbin=DIR Set dir where binary is istalled. [/sbin]], @@ -176,7 +179,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnctrl/configure.ac isdnutils-dfsg-3.2 AC_SUBST(INSTALL) diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 2014-11-19 00:14:25.926235549 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/aclocal.m4 2014-11-19 00:41:00.459401135 -0500 @@ -2,7 +2,7 @@ dnl Check for postgres dnl @@ -247,7 +250,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/aclocal.m4 isdnutils-dfsg-3.25.1 fi diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/acinclude.m4 2014-11-19 00:41:00.459401135 -0500 @@ -15,7 +15,7 @@ dnl PARTICULAR PURPOSE. @@ -934,7 +937,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/acinclude.m4 isdnutils-df - diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/configure.ac 2014-11-19 00:41:00.462734397 -0500 @@ -3,12 +3,12 @@ # I used much code from Janos Farkas @@ -995,7 +998,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/configure.ac isdnutils-df +AC_OUTPUT diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/client/src/Makefile.am 2014-11-19 00:41:00.462734397 -0500 @@ -14,7 +14,7 @@ # just set the variable APPSDIR = $(kde_appsdir)/Utilities @@ -1007,7 +1010,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/client/src/Makefile.am isdnutils diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/configure.ac 2014-11-19 00:41:00.462734397 -0500 @@ -81,45 +81,34 @@ dnl To make it possible to set variables in policy.h dnl they have to be defined with AC_DEFINE... @@ -1149,7 +1152,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/configure.ac isdnutils-dfsg-3.25 diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/isdnlog/tools/zone/configure.ac 2014-11-19 00:41:00.462734397 -0500 @@ -1,8 +1,13 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(mkzonedb.c) @@ -1175,20 +1178,23 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/isdnlog/tools/zone/configure.ac isdnutil dnl Checks for header files. AC_HEADER_STDC diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am ---- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am 2014-11-19 00:14:07.000000000 -0500 -+++ isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am 2014-11-19 00:14:25.929568813 -0500 -@@ -7,7 +7,7 @@ +--- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/Makefile.am 2014-11-19 00:40:58.000000000 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/rcapid/Makefile.am 2014-11-19 00:41:00.462734397 -0500 +@@ -7,9 +7,9 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in \ stamp-h.in comperr -INCLUDES = $(all_includes) -+AM_CPPFLAGS = $(all_includes) ++AM_CPPFLAGS = -I../capi20 $(all_includes) CFLAGS = -Wall -O2 - LDFLAGS = $(all_libraries) +-LDFLAGS = $(all_libraries) ++LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries) LDADD = -lcapi20 + + sbin_PROGRAMS = rcapid diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/rcapid/configure.ac 2014-11-19 00:41:00.462734397 -0500 @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(rcapid.c) @@ -1201,7 +1207,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/rcapid/configure.ac isdnutils-dfsg-3.25. CONFIG_SBINDIR=${CONFIG_SBINDIR:-"/sbin"} diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 --- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/acinclude.m4 2014-11-19 00:41:00.462734397 -0500 @@ -1,5 +1,5 @@ -AC_DEFUN(AC_FIND_FILE, @@ -1247,7 +1253,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/acinclude.m4 isdnutils-dfsg-3.25.1 ac_tcl_lib="" diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac --- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/configure.ac 2014-11-19 00:41:00.462734397 -0500 @@ -3,12 +3,13 @@ ## init ################################################################### @@ -1295,7 +1301,7 @@ diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/configure.ac isdnutils-dfsg-3.25.1 +AC_OUTPUT diff -ru isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am --- isdnutils-dfsg-3.25.1.3.5.orig/vbox3/vboxgetty/Makefile.am 2012-07-06 02:27:19.000000000 -0400 -+++ isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am 2014-11-19 00:14:25.929568813 -0500 ++++ isdnutils-dfsg-3.25.1.3.5/vbox3/vboxgetty/Makefile.am 2014-11-19 00:41:00.462734397 -0500 @@ -14,7 +14,7 @@ DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"$(pkgdatadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' -- cgit v1.1-4-g5e80