* don't rely on <arpa/inet.h> pulling in <netinet/in.h>
* fix ksh-isms and thus syntax errors in configure script ok sebastia@
This commit is contained in:
naddy
parent
2a4ad50255
commit
ea255a4d5a
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2012/04/05 20:36:03 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2012/07/09 14:54:25 naddy Exp $
|
||||
|
||||
COMMENT = daemon to control digital model railroad systems
|
||||
|
||||
DISTNAME = srcpd-2.1.1
|
||||
CATEGORIES = misc net
|
||||
REVISION = 4
|
||||
REVISION = 5
|
||||
|
||||
HOMEPAGE = http://srcpd.sourceforge.net/
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=srcpd/}
|
||||
@ -22,7 +22,7 @@ WANTLIB += c m pthread z xml2
|
||||
LIB_DEPENDS += textproc/libxml
|
||||
|
||||
AUTOCONF_VERSION = 2.64
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_STYLE = autoconf
|
||||
|
||||
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/srcpd
|
||||
|
||||
|
||||
111
misc/srcpd/patches/patch-configure_in
Normal file
111
misc/srcpd/patches/patch-configure_in
Normal file
@ -0,0 +1,111 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2012/07/09 14:54:26 naddy Exp $
|
||||
--- configure.in.orig Mon Jul 9 15:13:12 2012
|
||||
+++ configure.in Mon Jul 9 15:15:41 2012
|
||||
@@ -38,7 +38,7 @@ AC_ARG_ENABLE(ddl,
|
||||
[with_DLL="$enableval"], [with_DDL=yes])
|
||||
if test "$with_DDL" = "yes"; then
|
||||
AC_DEFINE(USE_DDL,1, [define to 1 if you want ddl support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_DDL, test "$with_DDL" = yes)
|
||||
|
||||
@@ -48,7 +48,7 @@ AC_ARG_ENABLE(ddls88,
|
||||
[with_DLL88="$enableval"], [with_DDLS88=yes])
|
||||
if test "$with_DDLS88" = "yes"; then
|
||||
AC_DEFINE(USE_DDLS88,1, [define to 1 if you want ddl-s88 support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_DDLS88, test "$with_DDLS88" = yes)
|
||||
|
||||
@@ -58,7 +58,7 @@ AC_ARG_ENABLE(hsi88,
|
||||
[with_HSI88="$leval"], [with_HSI88=yes])
|
||||
if test "$with_HSI88" = "yes"; then
|
||||
AC_DEFINE(USE_HSI88,1,[define to 1 if you want hsi-88 support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_HSI88, test "$with_HSI88" = yes)
|
||||
|
||||
@@ -68,7 +68,7 @@ AC_ARG_ENABLE(i2cdev,
|
||||
[with_I2C="$enableval"], [with_I2C=yes])
|
||||
if test "$with_I2C" = "yes"; then
|
||||
AC_DEFINE(USE_I2C,1, [define to 1 if you want i2c-dev support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_I2C, test "$with_I2C" = yes)
|
||||
|
||||
@@ -78,7 +78,7 @@ AC_ARG_ENABLE(intellibox,
|
||||
[with_IB="$enableval"], [with_IB=yes])
|
||||
if test "$with_IB" = "yes"; then
|
||||
AC_DEFINE(USE_IB,1,[define to 1 if you want intellibox support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_IB, test "$with_IB" = yes)
|
||||
|
||||
@@ -88,7 +88,7 @@ AC_ARG_ENABLE(li100,
|
||||
[with_LI100="$enableval"], [with_LI100=yes])
|
||||
if test "$with_LI100" = "yes"; then
|
||||
AC_DEFINE(USE_LI100,1,[define to 1 if you want li100 (RS232 + USB) support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_LI100, test "$with_LI100" = yes)
|
||||
|
||||
@@ -98,7 +98,7 @@ AC_ARG_ENABLE(loconet,
|
||||
[with_LOCONET="$enableval"], [with_LOCONET=yes])
|
||||
if test "$with_LOCONET" = "yes"; then
|
||||
AC_DEFINE(USE_LOCONET,1, [define to 1 if you want loconet support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_LOCONET, test "$with_LOCONET" = yes)
|
||||
|
||||
@@ -108,7 +108,7 @@ AC_ARG_ENABLE(loopback,
|
||||
[with_LOOPBACK="$enableval"], [with_LOOPBACK=yes])
|
||||
if test "$with_LOOPBACK" = "yes"; then
|
||||
AC_DEFINE(USE_LOOPBACK,1, [define to 1 if you want loopback support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_LOOPBACK, test "$with_LOOPBACK" = yes)
|
||||
|
||||
@@ -118,7 +118,7 @@ AC_ARG_ENABLE(m605x,
|
||||
[with_M605X="$enableval"], [with_M605X=yes])
|
||||
if test "$with_M605X" = "yes"; then
|
||||
AC_DEFINE(USE_M605X,1, [define to 1 if you want m605x support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_M605X, test "$with_M605X" = yes)
|
||||
|
||||
@@ -128,7 +128,7 @@ AC_ARG_ENABLE(selectrix,
|
||||
[with_SELECTRIX="$enableval"], [with_SELECTRIX=yes])
|
||||
if test "$with_SELECTRIX" = "yes"; then
|
||||
AC_DEFINE(USE_SELECTRIX,1,[define to 1 if you want selectrix support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_SELECTRIX, test "$with_SELECTRIX" = yes)
|
||||
|
||||
@@ -138,7 +138,7 @@ AC_ARG_ENABLE(zimo,
|
||||
[with_ZIMO="$enableval"], [with_ZIMO=yes])
|
||||
if test "$with_ZIMO" = "yes"; then
|
||||
AC_DEFINE(USE_ZIMO,1, [define to 1 if you want zimo support])
|
||||
- ((NUM_MODULES++))
|
||||
+ NUM_MODDULES=`expr $NUM_MODULES + 1`
|
||||
fi
|
||||
AM_CONDITIONAL(USE_ZIMO, test "$with_ZIMO" = yes)
|
||||
|
||||
@@ -320,7 +320,7 @@ if test "$with_SELECTRIX" != "yes"; then echo " sel
|
||||
if test "$with_ZIMO" != "yes"; then echo " zimo"; fi
|
||||
|
||||
echo
|
||||
-if ((NUM_MODULES == 0)); then
|
||||
+if test $NUM_MODULES -eq 0; then
|
||||
echo 'Warning: No device module configured; srcpd will not run propperly!'
|
||||
else
|
||||
echo "Run 'make' to continue."
|
||||
11
misc/srcpd/patches/patch-src_netservice_c
Normal file
11
misc/srcpd/patches/patch-src_netservice_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-src_netservice_c,v 1.3 2012/07/09 14:54:26 naddy Exp $
|
||||
--- src/netservice.c.orig Mon Jul 9 15:06:00 2012
|
||||
+++ src/netservice.c Mon Jul 9 15:08:54 2012
|
||||
@@ -6,6 +6,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <errno.h>
|
||||
#include <grp.h>
|
||||
Loading…
Reference in New Issue
Block a user