summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWesley Shields <wxs@FreeBSD.org>2009-07-13 18:10:22 +0000
committerWesley Shields <wxs@FreeBSD.org>2009-07-13 18:10:22 +0000
commit47d004b8ef66e94552af0c1b57c9e2f10453a08a (patch)
treee55bb35279847260a23fe103312556cace21167b
parentUpdate to 4047 (diff)
- Unbreak build by renaming memchr() to memchr9()
- While here respect LOCALBASE in scripts/configure - Pass maintainer to submitter PR: ports/136434 Submitted by: Chris Rees <utisoft@gmail.com>
Notes
Notes: svn path=/head/; revision=237708
-rw-r--r--net/openradius/Makefile6
-rw-r--r--net/openradius/files/patch-common-misc.c11
-rw-r--r--net/openradius/files/patch-common-misc.h11
-rw-r--r--net/openradius/scripts/configure4
4 files changed, 25 insertions, 7 deletions
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 9958ced3d74a..bae13bb578f4 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net
MASTER_SITES= http://www.xs4all.nl/~evbergen/openradius/download/ \
http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= utisoft@gmail.com
COMMENT= A RADIUS server with some actual documentation
LOGFILE?= /var/log/openradius.log
@@ -38,10 +38,6 @@ SCRIPTS_ENV+= USE_LDAP=yes
PLIST_SUB+= LDAP="@comment "
.endif
-.if ${OSVERSION} >= 800034 || (${OSVERSION} >= 700109 && ${OSVERSION} < 800000) || (${OSVERSION} >= 603103 && ${OSVERSION} < 700000)
-BROKEN= does not compile
-.endif
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/net/openradius/files/patch-common-misc.c b/net/openradius/files/patch-common-misc.c
new file mode 100644
index 000000000000..828dd80a515d
--- /dev/null
+++ b/net/openradius/files/patch-common-misc.c
@@ -0,0 +1,11 @@
+--- common/misc.c.orig 2009-07-07 18:15:41.000000000 +0100
++++ common/misc.c 2009-07-07 18:17:20.000000000 +0100
+@@ -43,7 +43,7 @@
+ */
+
+
+-char *memrchr(char *s, int c, ssize_t len)
++char *memrchr9(char *s, int c, ssize_t len)
+ {
+ char *ret;
+
diff --git a/net/openradius/files/patch-common-misc.h b/net/openradius/files/patch-common-misc.h
new file mode 100644
index 000000000000..121bf103513d
--- /dev/null
+++ b/net/openradius/files/patch-common-misc.h
@@ -0,0 +1,11 @@
+--- common/misc.h.orig 2009-07-07 18:15:47.000000000 +0100
++++ common/misc.h 2009-07-07 18:17:01.000000000 +0100
+@@ -90,7 +90,7 @@
+ * PROTOTYPES
+ */
+
+-char *memrchr(char *s, int c, ssize_t len);
++char *memrchr9(char *s, int c, ssize_t len);
+ void hex(char *buf, const char *src, ssize_t len);
+ void hmac_md5(char *out, char *in, META_ORD inl, char *key, META_ORD keyl);
+ void get_random_data(char *p, ssize_t len);
diff --git a/net/openradius/scripts/configure b/net/openradius/scripts/configure
index 60526cb87bc4..637cb8ee7b6e 100644
--- a/net/openradius/scripts/configure
+++ b/net/openradius/scripts/configure
@@ -36,7 +36,7 @@ END
if [ x$USE_LDAP != x ]; then
cat >> Makefile << END
TGT_LIB += modules/radldap/radldap
-CF_RADLDAP = -I$LDAPINCLUDE/usr/local/include
+CF_RADLDAP = -I$LDAPINCLUDE${LOCALBASE}/include
END
fi
@@ -58,7 +58,7 @@ LL_ALL =
### Module-specific build flags
#
-LF_RADLDAP = -L$LDAPLIB/usr/local/lib
+LF_RADLDAP = -L$LDAPLIB${LOCALBASE}/lib
LL_RADLDAP = -lldap -llber
### Build tools