alpine: fix compilation without sys/cdefs

Signed-off-by: Rosen Penev <redacted>

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 0abf3bb7ee8dc2966bb7d8b5541d517b6ec0bd7f..ec9d1e9e7783a8529b33407d419e68b52077ef42 100644 (file)
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alpine
 PKG_VERSION:=2.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://alpine.x10host.com/alpine/release/src

diff --git a/mail/alpine/patches/010-cdefs.patch b/mail/alpine/patches/010-cdefs.patch
new file mode 100644 (file)
index 0000000..f477d2d
--- /dev/null
+++ b/mail/alpine/patches/010-cdefs.patch
@@ -0,0 +1,38 @@
+--- a/regex/regex.h
++++ b/regex/regex.h
+@@ -42,16 +42,12 @@
+ #ifndef _REGEX_H_\r
+ #define       _REGEX_H_\r
+ \r
+-#ifdef WIN32\r
+ #include <sys/types.h>\r
+ #define __const\r
+ #define __BEGIN_DECLS\r
+ #define __END_DECLS\r
+ #define __P(_X) _X\r
+-#else\r
+-#include <sys/cdefs.h>\r
+ #define __stdcall\r
+-#endif\r
+ \r
+ /* types */\r
+ typedef off_t regoff_t;\r
+@@ -106,12 +102,16 @@ typedef struct {
+ #define       REG_LARGE       01000   /* force large representation */\r
+ #define       REG_BACKR       02000   /* force use of backref code */\r
+ \r
+-__BEGIN_DECLS\r
++#ifdef __cplusplus\r
++extern "C" {\r
++#endif\r
+ int   __stdcall regcomp __P((regex_t *, const char *, int));\r
+ size_t        __stdcall regerror __P((int, const regex_t *, char *, size_t));\r
+ int   __stdcall regexec __P((const regex_t *,\r
+           const char *, size_t, regmatch_t [], int));\r
+ void  __stdcall regfree __P((regex_t *));\r
+-__END_DECLS\r
++#ifdef __cplusplus\r
++}\r
++#endif\r
+ \r
+ #endif /* !_REGEX_H_ */\r