From 05d61abfd44d18a9716f98968bee5470898b622f Mon Sep 17 00:00:00 2001 From: naddy Date: Wed, 27 Sep 2017 21:05:42 +0000 Subject: [PATCH] Unbreak autoconf check with clang by not using nested function. Replace gettext module while here. --- comms/pilot-link/Makefile | 11 ++++---- comms/pilot-link/patches/patch-configure | 20 -------------- comms/pilot-link/patches/patch-configure_ac | 29 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) delete mode 100644 comms/pilot-link/patches/patch-configure create mode 100644 comms/pilot-link/patches/patch-configure_ac diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index d5dd97eec55..5887906b5db 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.81 2017/02/06 20:20:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.82 2017/09/27 21:05:42 naddy Exp $ COMMENT= tools to connect your PalmOS(R) compatible handheld DISTNAME= pilot-link-0.12.5 -REVISION= 9 +REVISION= 10 SHARED_LIBS += pisock 11.0 # 9.2 SHARED_LIBS += pisync 2.0 # 1.3 @@ -21,17 +21,16 @@ EXTRACT_SUFX= .tar.bz2 # GPLv2 - LGPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c m perl png popt pthread readline termcap z +WANTLIB += c iconv intl m perl png popt pthread readline termcap z # uses perl ABI -MODULES= devel/gettext - LIB_DEPENDS= graphics/png \ devel/popt USE_GMAKE= Yes -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.65 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_lib_png_main=yes diff --git a/comms/pilot-link/patches/patch-configure b/comms/pilot-link/patches/patch-configure deleted file mode 100644 index 0a663d28c0d..00000000000 --- a/comms/pilot-link/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-configure,v 1.10 2017/05/04 14:21:34 espie Exp $ - -Index: configure ---- configure.orig -+++ configure -@@ -15081,12 +15081,12 @@ $as_echo "#define HAVE_USB 1" >>confdefs.h - usb_type=linux - msg_usb="yes, Linux" - ;; -- *freebsd*) -+ *bsd*) - - $as_echo "#define HAVE_USB 1" >>confdefs.h - - usb_type=freebsd -- msg_usb="yes, FreeBSD" -+ msg_usb="yes, FreeBSD (OpenBSD)" - ;; - *darwin*) - diff --git a/comms/pilot-link/patches/patch-configure_ac b/comms/pilot-link/patches/patch-configure_ac new file mode 100644 index 00000000000..c9632d6537f --- /dev/null +++ b/comms/pilot-link/patches/patch-configure_ac @@ -0,0 +1,29 @@ +$OpenBSD: patch-configure_ac,v 1.1 2017/09/27 21:05:42 naddy Exp $ + +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -196,8 +196,8 @@ AC_CACHE_CHECK([for cispeed and cospeed members of str + ac_cv_termios_cspeed, + + [AC_TRY_COMPILE( +- [#include ], [int main(void) { +- struct termios t;t.c_ispeed=t.c_ospeed=0;}], ++ [#include ], [ ++ struct termios t;t.c_ispeed=t.c_ospeed=0;], + ac_cv_termios_cspeed=yes,ac_cv_termios_cspeed=no)]) + + if test $ac_cv_termios_cspeed = yes; then +@@ -321,10 +321,10 @@ else + usb_type=linux + msg_usb="yes, Linux" + ;; +- *freebsd*) ++ *bsd*) + AC_DEFINE(HAVE_USB, 1, [Define if we have USB support]) + usb_type=freebsd +- msg_usb="yes, FreeBSD" ++ msg_usb="yes, FreeBSD (OpenBSD)" + ;; + *darwin*) + AC_DEFINE(HAVE_USB, 1, [Define if we have USB support])