5 files changed, 283 insertions, 163 deletions

diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 8580e7197e71..af51c7136ac9 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -14,18 +14,18 @@ DISTNAME=	radius-${PORTVERSION}
 MAINTAINER=	lance@merlin.net.ua
 COMMENT=	GNU RADIUS server
 
-BROKEN=		Broken pkg-plist
-
-#MAKEFILE=	Makefile
-
 CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
 USE_RC_SUBR=	yes
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
+INSTALLS_SHLIB=	yes
+USE_GETTEXT=	yes
 CONFIGURE_TARGET=	# empty
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+DATADIR=	${PREFIX}/share/radius
 
 INFO=		radius
 MAN1=		radgrep.1 radlast.1 raduse.1 radwho.1
@@ -35,17 +35,73 @@ MANCOMPRESSED=	no
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		CURDIR="${.CURDIR}" \
 		MKDIR="${MKDIR}"
-
-.if defined(BATCH)
 CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \
 		--with-lib-path="${LOCALBASE}/lib/"
+
+OPTIONS=	CLIENT "Enable build client" off \
+		DBM "Enable DBM support" off \
+		MYSQL "Enable MySQL support" on \
+		POSTGRESQL "Enable PostgreSQL support" off \
+		SNMP "Enable SNMP support" off \
+		NOTIFY "Enable TTL notification" off \
+		EMACS "Enable emacs dotfiles install" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SNMP)
+CONFIGURE_ARGS+=	--enable-snmp
+.endif
+
+.if defined(WITH_CLIENT)
+CONFIGURE_ARGS+=	--enable-client
+WITH_GUILE=	yes
+BUILD_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+PLIST_SUB+=	GUILE=""
+PLIST_SUB+=	CLIENT=""
 .else
-post-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+CONFIGURE_ARGS+=	--without-guile
+PLIST_SUB+=	GUILE="@comment "
+PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=	--with-mysql
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if defined(WITH_POSTGRESQL)
+POSTGRESQL_PORT?=	databases/postgresql7
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+CONFIGURE_ARGS+=	--with-postgres
+INCLUDE_PATH+=	${LOCALBASE}/include/pgsql/
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+
+.if defined(WITH_DBM)
+CONFIGURE_ARGS+=	--enable-dbm=ndbm
+PLIST_SUB+=	DBM=""
+.else
+PLIST_SUB+=	DBM="@comment "
+.endif
+
+.if defined(WITH_NOTIFY)
+CONFIGURE_ARGS+=	--enable-notify
+.endif
+
+.if defined(WITH_EMACS)
+EMACS_PORT_NAME=	emacs20
+.include "${PORTSDIR}/Mk/bsd.emacs.mk"
+CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}
+PLIST_SUB+=	EMACS=""
+.else
+EXTRA_PATCHES+=		${FILESDIR}/extrapatch-emacs
+CONFIGURE_ARGS+=	--without-lispdir
+PLIST_SUB+=	EMACS="@comment "
 .endif
 
 post-patch:
@@ -55,7 +111,4 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gnu-radius/files/extrapatch-emacs b/net/gnu-radius/files/extrapatch-emacs
new file mode 100644
index 000000000000..7a06c4d04fb7
--- /dev/null
+++ b/net/gnu-radius/files/extrapatch-emacs
@@ -0,0 +1,91 @@
+--- configure.orig	Mon May  2 20:32:36 2005
++++ configure	Mon May  2 20:33:56 2005
+@@ -9868,49 +9868,49 @@
+ ### Check for Emacs site-lisp directory
+  # If set to t, that means we are running in a shell under Emacs.
+  # If you have an Emacs named "t", then use the full path.
+- test x"$EMACS" = xt && EMACS=
+- for ac_prog in emacs xemacs
+-do
++# test x"$EMACS" = xt && EMACS=
++# for ac_prog in emacs xemacs
++#do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_EMACS+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$EMACS"; then
+-  ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_EMACS="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++#set dummy $ac_prog; ac_word=$2
++#echo "$as_me:$LINENO: checking for $ac_word" >&5
++#echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++#if test "${ac_cv_prog_EMACS+set}" = set; then
++#  echo $ECHO_N "(cached) $ECHO_C" >&6
++#else
++#  if test -n "$EMACS"; then
++#  ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
++#else
++#as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++#for as_dir in $PATH
++#do
++#  IFS=$as_save_IFS
++#  test -z "$as_dir" && as_dir=.
++#  for ac_exec_ext in '' $ac_executable_extensions; do
++#  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++#    ac_cv_prog_EMACS="$ac_prog"
++#    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++#    break 2
++#  fi
++#done
++#done
+ 
+-fi
+-fi
+-EMACS=$ac_cv_prog_EMACS
+-if test -n "$EMACS"; then
+-  echo "$as_me:$LINENO: result: $EMACS" >&5
+-echo "${ECHO_T}$EMACS" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$EMACS" && break
+-done
+-test -n "$EMACS" || EMACS="no"
++#fi
++#fi
++#EMACS=$ac_cv_prog_EMACS
++#if test -n "$EMACS"; then
++#  echo "$as_me:$LINENO: result: $EMACS" >&5
++#echo "${ECHO_T}$EMACS" >&6
++#else
++#  echo "$as_me:$LINENO: result: no" >&5
++#echo "${ECHO_T}no" >&6
++#fi
+ 
++#  test -n "$EMACS" && break
++#done
++#test -n "$EMACS" || EMACS="no"
+ 
++EMACS="no"
+ 
+ 
+ # Check whether --with-lispdir or --without-lispdir was given.
diff --git a/net/gnu-radius/files/patch-intl::Makefile.in b/net/gnu-radius/files/patch-intl::Makefile.in
new file mode 100644
index 000000000000..378bf0676733
--- /dev/null
+++ b/net/gnu-radius/files/patch-intl::Makefile.in
@@ -0,0 +1,103 @@
+--- intl/Makefile.in.orig	Tue May  3 16:14:12 2005
++++ intl/Makefile.in	Tue May  3 16:22:23 2005
+@@ -123,7 +123,7 @@
+   osdep.$lo \
+   intl-compat.$lo
+ DISTFILES.common = Makefile.in \
+-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
++ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+ DISTFILES.generated = plural.c
+ DISTFILES.normal = VERSION
+ DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
+@@ -132,7 +132,7 @@
+ COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
+ 
+ all: all-@USE_INCLUDED_LIBINTL@
+-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
++all-yes: libintl.$la libintl.h ref-add.sed ref-del.sed
+ all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+ all-no-yes: libgnuintl.$la
+ all-no-no:
+@@ -229,10 +229,6 @@
+ libintl.h: libgnuintl.h
+ 	cp libgnuintl.h libintl.h
+ 
+-charset.alias: $(srcdir)/config.charset
+-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+-	mv t-$@ $@
+-
+ check: all
+ 
+ # We must not install the libintl.h/libintl.a files if we are on a
+@@ -271,30 +267,6 @@
+ 	fi
+ 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+-	    sed -f ref-add.sed $$orig > $$temp; \
+-	    $(INSTALL_DATA) $$temp $$dest; \
+-	    rm -f $$temp; \
+-	  else \
+-	    if test @GLIBC21@ = no; then \
+-	      orig=charset.alias; \
+-	      sed -f ref-add.sed $$orig > $$temp; \
+-	      $(INSTALL_DATA) $$temp $$dest; \
+-	      rm -f $$temp; \
+-	    fi; \
+-	  fi; \
+-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+-	  test -f $(DESTDIR)$(localedir)/locale.alias \
+-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+-	    || orig=$(srcdir)/locale.alias; \
+-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
+-	  sed -f ref-add.sed $$orig > $$temp; \
+-	  $(INSTALL_DATA) $$temp $$dest; \
+-	  rm -f $$temp; \
+ 	else \
+ 	  : ; \
+ 	fi
+@@ -308,7 +280,6 @@
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+ 	  done; \
+-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+ 	  dists="$(DISTFILES.generated)"; \
+ 	  for file in $$dists; do \
+ 	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+@@ -365,32 +336,6 @@
+ 	if test "$(PACKAGE)" = "gettext-tools" \
+ 	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+ 	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+-	else \
+-	  : ; \
+-	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
+-	    sed -f ref-del.sed $$dest > $$temp; \
+-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+-	      rm -f $$dest; \
+-	    else \
+-	      $(INSTALL_DATA) $$temp $$dest; \
+-	    fi; \
+-	    rm -f $$temp; \
+-	  fi; \
+-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
+-	    sed -f ref-del.sed $$dest > $$temp; \
+-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+-	      rm -f $$dest; \
+-	    else \
+-	      $(INSTALL_DATA) $$temp $$dest; \
+-	    fi; \
+-	    rm -f $$temp; \
+-	  fi; \
+ 	else \
+ 	  : ; \
+ 	fi
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index 90b08112129f..c9b8654d14c0 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -33,8 +33,6 @@ etc/raddb/realms
 etc/raddb/sqlserver
 etc/raddb/users
 etc/rc.d/radiusd.sh
-@dirrm etc/raddb/dict
-@dirrm etc/raddb
 include/radius/argcv.h
 include/radius/argp.h
 include/radius/dictionary.h
@@ -54,44 +52,40 @@ include/radius/radutmp.h
 include/radius/sha1.h
 include/radius/symtab.h
 include/radius/types.h
-@dirrm include/radius
 lib/libgnuradius.a
-lib/libgnuradius.la
 lib/libgnuradius.so
 lib/libgnuradius.so.0
 %%GUILE%%bin/radsession
-%%GUILE%%lib/libradscm.a
-%%GUILE%%lib/libradscm.la
 %%GUILE%%lib/libradscm.so
 %%GUILE%%lib/libradscm.so.0
-%%CLIENT%%lib/libservscm.a
-%%CLIENT%%lib/security/pam_radius.a
-%%CLIENT%%lib/security/pam_radius.la
 %%CLIENT%%lib/security/pam_radius.so
 %%CLIENT%%libexec/nas.scm
 share/locale/ca/LC_MESSAGES/radius.mo
 share/locale/es/LC_MESSAGES/radius.mo
 share/locale/pl/LC_MESSAGES/radius.mo
 share/locale/ru/LC_MESSAGES/radius.mo
-%%GUILE%%share/radius/%%PORTVERSION%%/scheme/gnuradius.scm
-%%GUILE%%share/radius/%%PORTVERSION%%/scheme/ipalloc.scm
-%%GUILE%%share/radius/%%PORTVERSION%%/scheme/radiusd.scm
-%%GUILE%%share/radius/%%PORTVERSION%%/scheme/ttl.scm
-%%GUILE%%share/radius/%%PORTVERSION%%/scheme/guile-procedures.txt
-share/radius/%%PORTVERSION%%/rewrite/checknas.rw
-share/radius/%%PORTVERSION%%/rewrite/log-hook.rw
-share/radius/%%PORTVERSION%%/rewrite/nas-ip.rw
-%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.a
-%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.la
-%%MYSQL%%share/radius/%%PORTVERSION%%/modules/mysql.so
-%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.a
-%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.la
-%%PGSQL%%share/radius/%%PORTVERSION%%/modules/postgres.so
-@dirrm share/radius/%%PORTVERSION%%/scheme
-@dirrm share/radius/%%PORTVERSION%%/rewrite
-@dirrm share/radius/%%PORTVERSION%%/modules
-@dirrm share/radius/%%PORTVERSION%%
-@dirrm share/radius
+%%GUILE%%%%DATADIR%%/%%PORTVERSION%%/scheme/gnuradius.scm
+%%GUILE%%%%DATADIR%%/%%PORTVERSION%%/scheme/ipalloc.scm
+%%GUILE%%%%DATADIR%%/%%PORTVERSION%%/scheme/radiusd.scm
+%%GUILE%%%%DATADIR%%/%%PORTVERSION%%/scheme/ttl.scm
+%%GUILE%%%%DATADIR%%/%%PORTVERSION%%/scheme/guile-procedures.txt
+%%DATADIR%%/%%PORTVERSION%%/rewrite/checknas.rw
+%%DATADIR%%/%%PORTVERSION%%/rewrite/log-hook.rw
+%%DATADIR%%/%%PORTVERSION%%/rewrite/nas-ip.rw
+%%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.so
+%%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.so
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/radconf-mode.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/radius-mode.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/rewrite-mode.el
+@dirrm etc/raddb/dict
+@dirrm etc/raddb
+@dirrm include/radius
+@dirrm %%DATADIR%%/%%PORTVERSION%%/scheme
+@dirrm %%DATADIR%%/%%PORTVERSION%%/rewrite
+@dirrm %%DATADIR%%/%%PORTVERSION%%/modules
+@dirrm %%DATADIR%%/%%PORTVERSION%%
+@dirrm %%DATADIR%%
+@unexec rmdir %D/lib/security 2>/dev/null || true
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone."
diff --git a/net/gnu-radius/scripts/configure b/net/gnu-radius/scripts/configure
index 5e95f25e93b1..e69de29bb2d1 100644
--- a/net/gnu-radius/scripts/configure
+++ b/net/gnu-radius/scripts/configure
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-	set \"MySQL\"
-else
-	/usr/bin/dialog --title "GNU-Radius configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-Client		"Enable build client" OFF \
-DBM		    "Enable DBM support" OFF \
-MySQL		"Enable MySQL support" ON \
-PostgreSQL	"Enable PostgreSQL support" OFF \
-SNMP	    "Enable SNMP support" ON \
-Notify		"Enable TTL notification" OFF \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-INCLUDE_PATH=${LOCALBASE}/include/
-LIB_PATH=${LOCALBASE}/lib/
-
-while [ "$1" ]; do
-	case $1 in
-		\"Client\")
-			echo "CONFIGURE_ARGS+= --enable-client"
-			export CLIENT=Yes
-			export GUILE=Yes
-			;;
-		\"DBM\")
-			echo "CONFIGURE_ARGS+= --enable-dbm=ndbm"
-			;;
-		\"MySQL\")
-			echo "USE_MYSQL=	YES"
-			echo "CONFIGURE_ARGS+= --with-mysql"
-			LIB_PATH="$LIB_PATH:${LOCALBASE}/lib/mysql/"
-			export MYSQL=Yes
-			;;
-		\"PostgreSQL\")
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "CONFIGURE_ARGS+= --with-postgres"
-			INCLUDE_PATH="$INCLUDE_PATH:${LOCALBASE}/include/pgsql/"
-			export PGSQL=Yes
-			;;
-		\"SNMP\")
-			echo "CONFIGURE_ARGS+= --enable-snmp"
-			;;
-		\"Notify\")
-			echo "CONFIGURE_ARGS+= --enable-notify"
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "CONFIGURE_ARGS+= --with-include-path=\"$INCLUDE_PATH\""
-echo "CONFIGURE_ARGS+= --with-lib-path=\"$LIB_PATH\""
-
-if [ -z $GUILE ]; then
-	echo "CONFIGURE_ARGS+= --without-guile"
-	echo "GUILE=	\"@comment \""
-else
-	echo "BUILD_DEPENDS+= guile:${PORTSDIR}/lang/guile"
-	echo "GUILE=	\"\""
-	unset GUILE
-fi
-
-if [ -z $CLIENT ]; then
-	echo "CLIENT=   \"@comment \""
-else
-	echo "CLIENT=   \"\""
-	unset CLIENT
-fi
-
-if [ -z $MYSQL ]; then
-	echo "MYSQL=    \"@comment \""
-else
-	echo "MYSQL=    \"\""
-	unset MYSQL
-fi
-
-if [ -z $PGSQL ]; then
-	echo "PGSQL=    \"@comment \""
-else
-	echo "PGSQL=    \"\""
-	unset PGSQL
-fi
-
-echo "PLIST_SUB+=	GUILE=\${GUILE}"
-echo "PLIST_SUB+=	CLIENT=\${CLIENT}"
-echo "PLIST_SUB+=	PGSQL=\${PGSQL}"
-echo "PLIST_SUB+=	MYSQL=\${MYSQL}"