diff options
Diffstat (limited to 'net/ocserv')
| -rw-r--r-- | net/ocserv/Makefile | 3 | ||||
| -rw-r--r-- | net/ocserv/files/patch-configure.ac | 18 | ||||
| -rw-r--r-- | net/ocserv/files/patch-libopts_m4_libopts.m4 | 18 |
3 files changed, 33 insertions, 6 deletions
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index af9baf607ff7..dc27863d28eb 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -3,6 +3,7 @@ PORTNAME= ocserv PORTVERSION= 0.11.4 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ @@ -23,7 +24,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libev.so:devel/libev \ libnettle.so:security/nettle -USES= autoreconf cpe gettext gmake gperf libtool localbase ncurses \ +USES= autoreconf cpe gmake gperf libtool localbase ncurses \ pathfix pkgconfig readline tar:xz CPE_VENDOR= infradead GNU_CONFIGURE= yes diff --git a/net/ocserv/files/patch-configure.ac b/net/ocserv/files/patch-configure.ac index 227dbaa1ea0b..846343d44be6 100644 --- a/net/ocserv/files/patch-configure.ac +++ b/net/ocserv/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2015-09-04 19:27:22 UTC +--- configure.ac.orig 2016-08-04 06:12:29 UTC +++ configure.ac @@ -19,7 +19,7 @@ if [ test "$GCC" = "yes" ];then fi @@ -7,9 +7,9 @@ -AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [:]) +AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [autogen]) - if test x"$AUTOGEN" = "x:"; then - AC_MSG_WARN([[ -@@ -125,7 +125,7 @@ if test "$test_for_libnl" = yes;then + AX_CODE_COVERAGE + +@@ -133,7 +133,7 @@ if test "$test_for_libnl" = yes;then fi have_readline=no @@ -18,7 +18,15 @@ #include <stdio.h> #include <readline/readline.h>], [rl_replace_line(0,0);]) if test x$ac_cv_libreadline = xyes; then -@@ -442,7 +442,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the +@@ -183,6 +183,7 @@ AC_ARG_WITH(pam, + + pam_enabled=no + ++oldlibs=$LIBS + if test "$test_for_pam" = yes;then + LIBS="$oldlibs -lpam" + AC_MSG_CHECKING([for pam library]) +@@ -496,7 +497,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";the cp -f $i $nam fi done diff --git a/net/ocserv/files/patch-libopts_m4_libopts.m4 b/net/ocserv/files/patch-libopts_m4_libopts.m4 new file mode 100644 index 000000000000..6aa028f45453 --- /dev/null +++ b/net/ocserv/files/patch-libopts_m4_libopts.m4 @@ -0,0 +1,18 @@ +--- libopts/m4/libopts.m4.orig 2015-12-01 10:21:06 UTC ++++ libopts/m4/libopts.m4 +@@ -55,6 +55,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AS_HELP_STRING([--disable-nls],[disable nls support in libopts])) + AS_IF([test "x$enable_nls" != "xno" && \ + test "X${ac_cv_header_libintl_h}" = Xyes], [ ++ AC_CHECK_LIB(intl,gettext) + AC_DEFINE([ENABLE_NLS],[1],[nls support in libopts])]) + + # -------------------------------------------- +@@ -106,7 +107,6 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + # AC_CHECK_LIB + # ------------ + AC_CHECK_LIB(gen, pathfind) +- AC_CHECK_LIB(intl,gettext) + AC_FUNC_VPRINTF + AC_FUNC_FORK + AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ |