- Add patch to fix build on 4.x [1]

- Implement a modern feature of USE_RC_SUBR and remove redundant commands.

PR:		ports/92815 [1]
Submitted by:	Dan Lukes <dan@obluda.cz>

8 files changed, 122 insertions, 26 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 738363733b2a..548dbad048ae 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -20,7 +20,7 @@ LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	radiusd
 USE_AUTOTOOLS=	libltdl:15 libtool:13
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -103,6 +103,13 @@ MAKE_ENV+=	NOPORTDOCS=yes
 #CONFIGURE_ARGS+=--without-rlm_x99_token
 PLIST_SUB+=	TOKEN=""
 
+# rlm_perl does not build on 4.x
+.if ${OSVERSION} < 500000
+PLIST_SUB+=	RLMPERL="@comment "
+.else
+PLIST_SUB+=	RLMPERL="@comment "
+.endif
+
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--with-pic
 .endif
@@ -146,13 +153,7 @@ DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
 		dictionary.versanet dictionary.waverider dictionary.wispr \
 		dictionary.xedia dictionary.xylan dictionary.zyxel
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile
-.endif
-
 post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
 	@${RM} ${WRKSRC}/doc/Makefile.orig
 
 post-install:
@@ -160,7 +161,6 @@ post-install:
 .for dict in ${DICTS}
 	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 .ifdef(WITH_MYSQL)
 	${INSTALL_DATA} \
 	${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql \
diff --git a/net/freeradius/files/patch-4.11-fix b/net/freeradius/files/patch-4.11-fix
new file mode 100644
index 000000000000..b58a4d5c91e4
--- /dev/null
+++ b/net/freeradius/files/patch-4.11-fix
@@ -0,0 +1,48 @@
+--- src/modules/rlm_otp/cardops/cryptocard.c.ORIG	Thu Dec  8 02:30:54 2005
++++ src/modules/rlm_otp/cardops/cryptocard.c	Sat Feb  4 18:30:55 2006
+@@ -20,6 +20,10 @@
+  */
+ 
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define PRIx32          "x"     /* uint32_t */
++#define SCNx32          "x"     /* uint32_t */
++#endif
+ #include <string.h>
+ #include <time.h>
+ 
+--- src/modules/rlm_otp/otp_state.c.ORIG	Sat Feb  4 18:22:14 2006
++++ src/modules/rlm_otp/otp_state.c	Sat Feb  4 18:33:48 2006
+@@ -28,6 +28,10 @@
+ 
+ #include <errno.h>
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define PRIx32          "x"     /* uint32_t */
++#define SCNx32          "x"     /* uint32_t */
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
+--- src/modules/rlm_otp/otp_cardops.c.ORIG	Thu Dec  8 02:30:50 2005
++++ src/modules/rlm_otp/otp_cardops.c	Sat Feb  4 18:37:22 2006
+@@ -30,6 +30,9 @@
+ #endif
+ #include <dlfcn.h>
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define     INT32_MAX       0x7fffffff
++#endif
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- src/modules/rlm_otp/Makefile.in.ORIG	Thu Dec  8 02:30:48 2005
++++ src/modules/rlm_otp/Makefile.in	Sat Feb  4 18:44:06 2006
+@@ -34,7 +34,7 @@
+ include ../rules.mak
+ 
+ # Not part of RLM_CFLAGS to avoid propagation to subdirs
+-CFLAGS     += -Wno-unused-label -Wno-cast-qual
++CFLAGS     += -Wno-cast-qual
+ 
+ $(STATIC_OBJS): $(HEADERS) $(CARDOPS_LTLIBS)
diff --git a/net/freeradius/files/radiusd.sh b/net/freeradius/files/radiusd.in
index 7f18ab7c40d2..7f18ab7c40d2 100644
--- a/net/freeradius/files/radiusd.sh
+++ b/net/freeradius/files/radiusd.in
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index f53d7e14eb11..0237bdbdf13f 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -236,11 +236,11 @@ lib/rlm_passwd-%%PORTVERSION%%.so
 lib/rlm_passwd.a
 lib/rlm_passwd.la
 lib/rlm_passwd.so
-lib/rlm_perl-%%PORTVERSION%%.la
-lib/rlm_perl-%%PORTVERSION%%.so
-lib/rlm_perl.a
-lib/rlm_perl.la
-lib/rlm_perl.so
+%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.la
+%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.so
+%%RLMPERL%%lib/rlm_perl.a
+%%RLMPERL%%lib/rlm_perl.la
+%%RLMPERL%%lib/rlm_perl.so
 lib/rlm_preprocess-%%PORTVERSION%%.la
 lib/rlm_preprocess-%%PORTVERSION%%.so
 lib/rlm_preprocess.a
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 738363733b2a..548dbad048ae 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -20,7 +20,7 @@ LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	radiusd
 USE_AUTOTOOLS=	libltdl:15 libtool:13
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -103,6 +103,13 @@ MAKE_ENV+=	NOPORTDOCS=yes
 #CONFIGURE_ARGS+=--without-rlm_x99_token
 PLIST_SUB+=	TOKEN=""
 
+# rlm_perl does not build on 4.x
+.if ${OSVERSION} < 500000
+PLIST_SUB+=	RLMPERL="@comment "
+.else
+PLIST_SUB+=	RLMPERL="@comment "
+.endif
+
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--with-pic
 .endif
@@ -146,13 +153,7 @@ DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
 		dictionary.versanet dictionary.waverider dictionary.wispr \
 		dictionary.xedia dictionary.xylan dictionary.zyxel
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile
-.endif
-
 post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
-		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
 	@${RM} ${WRKSRC}/doc/Makefile.orig
 
 post-install:
@@ -160,7 +161,6 @@ post-install:
 .for dict in ${DICTS}
 	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 .ifdef(WITH_MYSQL)
 	${INSTALL_DATA} \
 	${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql \
diff --git a/net/freeradius2/files/patch-4.11-fix b/net/freeradius2/files/patch-4.11-fix
new file mode 100644
index 000000000000..b58a4d5c91e4
--- /dev/null
+++ b/net/freeradius2/files/patch-4.11-fix
@@ -0,0 +1,48 @@
+--- src/modules/rlm_otp/cardops/cryptocard.c.ORIG	Thu Dec  8 02:30:54 2005
++++ src/modules/rlm_otp/cardops/cryptocard.c	Sat Feb  4 18:30:55 2006
+@@ -20,6 +20,10 @@
+  */
+ 
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define PRIx32          "x"     /* uint32_t */
++#define SCNx32          "x"     /* uint32_t */
++#endif
+ #include <string.h>
+ #include <time.h>
+ 
+--- src/modules/rlm_otp/otp_state.c.ORIG	Sat Feb  4 18:22:14 2006
++++ src/modules/rlm_otp/otp_state.c	Sat Feb  4 18:33:48 2006
+@@ -28,6 +28,10 @@
+ 
+ #include <errno.h>
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define PRIx32          "x"     /* uint32_t */
++#define SCNx32          "x"     /* uint32_t */
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
+--- src/modules/rlm_otp/otp_cardops.c.ORIG	Thu Dec  8 02:30:50 2005
++++ src/modules/rlm_otp/otp_cardops.c	Sat Feb  4 18:37:22 2006
+@@ -30,6 +30,9 @@
+ #endif
+ #include <dlfcn.h>
+ #include <inttypes.h>
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000)
++#define     INT32_MAX       0x7fffffff
++#endif
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- src/modules/rlm_otp/Makefile.in.ORIG	Thu Dec  8 02:30:48 2005
++++ src/modules/rlm_otp/Makefile.in	Sat Feb  4 18:44:06 2006
+@@ -34,7 +34,7 @@
+ include ../rules.mak
+ 
+ # Not part of RLM_CFLAGS to avoid propagation to subdirs
+-CFLAGS     += -Wno-unused-label -Wno-cast-qual
++CFLAGS     += -Wno-cast-qual
+ 
+ $(STATIC_OBJS): $(HEADERS) $(CARDOPS_LTLIBS)
diff --git a/net/freeradius2/files/radiusd.sh b/net/freeradius2/files/radiusd.in
index 7f18ab7c40d2..7f18ab7c40d2 100644
--- a/net/freeradius2/files/radiusd.sh
+++ b/net/freeradius2/files/radiusd.in
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index f53d7e14eb11..0237bdbdf13f 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -236,11 +236,11 @@ lib/rlm_passwd-%%PORTVERSION%%.so
 lib/rlm_passwd.a
 lib/rlm_passwd.la
 lib/rlm_passwd.so
-lib/rlm_perl-%%PORTVERSION%%.la
-lib/rlm_perl-%%PORTVERSION%%.so
-lib/rlm_perl.a
-lib/rlm_perl.la
-lib/rlm_perl.so
+%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.la
+%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.so
+%%RLMPERL%%lib/rlm_perl.a
+%%RLMPERL%%lib/rlm_perl.la
+%%RLMPERL%%lib/rlm_perl.so
 lib/rlm_preprocess-%%PORTVERSION%%.la
 lib/rlm_preprocess-%%PORTVERSION%%.so
 lib/rlm_preprocess.a