From 6d06012e924ca1543bb1ae0d56b6ad6dba683036 Mon Sep 17 00:00:00 2001
From: rene <rene@FreeBSD.org>
Date: Tue, 7 Mar 2017 19:14:12 +0000
Subject: net/freeradius2: remove expired optional dependency on
 databases/oracle8-client

---
 net/freeradius2/Makefile                 | 14 +-------------
 net/freeradius2/files/extra-patch-exec.c | 11 -----------
 net/freeradius2/pkg-plist                |  3 ---
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 net/freeradius2/files/extra-patch-exec.c

(limited to 'net/freeradius2')

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index a53789f61828..9033534d1356 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -80,7 +80,7 @@ GROUPS=		${RADIUS_GROUP}
 _REQUIRE=	NETWORKING SERVERS
 
 OPTIONS_DEFINE=	USER KERBEROS HEIMDAL HEIMDAL_PORT LDAP MYSQL \
-		PGSQL UNIXODBC FIREBIRD PERL PYTHON OCI8 RUBY DHCP \
+		PGSQL UNIXODBC FIREBIRD PERL PYTHON RUBY DHCP \
 		EXPERIMENTAL UDPFROMTO DEVELOPER EDIR DOCS
 OPTIONS_DEFAULT=USER PERL PYTHON
 
@@ -90,7 +90,6 @@ HEIMDAL_DESC=		With Heimdal Kerberos support
 HEIMDAL_PORT_DESC=	With Heimdal Kerberos from ports
 UNIXODBC_DESC=		With unixODBC database support
 FIREBIRD_DESC=		With Firebird database support (EXPERIMENTAL)
-OCI8_DESC=		With Oracle support (currently experimental)
 EXPERIMENTAL_DESC=	Build experimental modules
 UDPFROMTO_DESC=		Compile in UDPFROMTO support
 DEVELOPER_DESC=		Enable developer options
@@ -252,18 +251,7 @@ EXPM=		yes
 #EXPM=		yes
 #.endif
 
-# Oracle support is experimental under FreeBSD
-.if ${PORT_OPTIONS:MOCI8}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-exec.c
-CONFIGURE_ENV+=	ORACLE_HOME="${ORACLE_HOME}"
-ORACLE_HOME?=	${LOCALBASE}/oracle8-client
-BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
-CONFIGURE_ARGS+=--with-oracle-home-dir=${ORACLE_HOME}/rdbms/demo
-PLIST_SUB+=	OCI8=""
-.else
 CONFIGURE_ARGS+=--without-rlm_sql_oracle
-PLIST_SUB+=	OCI8="@comment "
-.endif
 
 .if ${PORT_OPTIONS:MEXPERIMENTAL} || defined(EXPM)
 CONFIGURE_ARGS+=--with-experimental-modules
diff --git a/net/freeradius2/files/extra-patch-exec.c b/net/freeradius2/files/extra-patch-exec.c
deleted file mode 100644
index 803b38bcbe65..000000000000
--- a/net/freeradius2/files/extra-patch-exec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/exec.c	2008-12-05 11:37:56.000000000 -0500
-+++ src/main/exec.c	2009-01-18 17:43:32.000000000 -0500
-@@ -222,6 +222,8 @@
- 		output_pairs = NULL;
- 	}
-
-+	signal(SIGCHLD, SIG_DFL);
-+
- 	if (exec_wait) {
- 		pid = rad_fork();	/* remember PID */
- 	} else {
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 6a4ffa8ecadf..53018643e377 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -226,9 +226,6 @@ include/freeradius/vqp.h
 %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql-%%PORTVERSION%%.so
 %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.a
 %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.so
-%%OCI8%%%%LIBDIR%%/rlm_sql_oracle-%%PORTVERSION%%.so
-%%OCI8%%%%LIBDIR%%/rlm_sql_oracle.a
-%%OCI8%%%%LIBDIR%%/rlm_sql_oracle.so
 %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql-%%PORTVERSION%%.so
 %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.a
 %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.so
-- 
cgit