ports/77705: [maintainer upadate] fix net/freeradius compile with PGSQL

[Andrew Thompson]

>Number:         77705
>Category:       ports
>Synopsis:       [maintainer upadate] fix net/freeradius compile with PGSQL
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 19 02:40:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Thompson
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD veg.fud.org.nz 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Sun Feb 6 01:14:02 NZDT 2005 thompsa at veg.fud.org.nz:/usr/obj/usr/src/sys/DEV i386


	
>Description:
Fix a few places where freeradius ignores CPPFLAGS or LDFLAGS. When compiling 
with PGSQL support (USE_PGSQL), CPPFLAGS and LDFLAGS are set by bsd.port.mk.

This interferes with the cockeyed way that the configure scrips work on a few 
modules and it ends up with no include or library path at all. This breaks the 
compile for rlm_sql and rlm_counter as they link to libpg and libgdbm.

>How-To-Repeat:
>Fix:


diff -urN net/freeradius.orig/files/patch-Make.inc.in net/freeradius/files/patch-Make.inc.in
--- net/freeradius.orig/files/patch-Make.inc.in	Thu Jan  1 12:00:00 1970
+++ net/freeradius/files/patch-Make.inc.in	Sat Feb 19 14:34:26 2005
@@ -0,0 +1,11 @@
+--- Make.inc.in.orig	Sat Feb 19 14:33:58 2005
++++ Make.inc.in	Sat Feb 19 14:33:07 2005
+@@ -25,7 +25,7 @@
+ CC		= @CC@
+ RANLIB		= @RANLIB@
+ INCLUDE		= 
+-CFLAGS		= $(INCLUDE) @CFLAGS@ @LFS_CFLAGS@
++CFLAGS		= $(INCLUDE) @CFLAGS@ @CPPFLAGS@ @LFS_CFLAGS@
+ LIBPREFIX	= @LIBPREFIX@
+ EXEEXT		= @EXEEXT@ 
+ 
diff -urN net/freeradius.orig/files/patch-src::modules::rlm_ippool::Makefile.in net/freeradius/files/patch-src::modules::rlm_ippool::Makefile.in
--- net/freeradius.orig/files/patch-src::modules::rlm_ippool::Makefile.in	Thu Jan  1 12:00:00 1970
+++ net/freeradius/files/patch-src::modules::rlm_ippool::Makefile.in	Sat Feb 19 15:00:07 2005
@@ -0,0 +1,11 @@
+--- src/modules/rlm_ippool/Makefile.in.orig	Sat Feb 19 14:57:57 2005
++++ src/modules/rlm_ippool/Makefile.in	Sat Feb 19 14:58:28 2005
+@@ -9,7 +9,7 @@
+ include ../rules.mak
+ 
+ rlm_ippool_tool: rlm_ippool_tool.o
+-	$(LIBTOOL) --mode=link $(CC) $^ $(LIBS) $(RLM_LIBS) -o $@
++	$(LIBTOOL) --mode=link $(CC) $^ $(LDFLAGS) $(LIBS) $(RLM_LIBS) -o $@
+ 
+ rlm_ippool_tool.8: rlm_ippool_tool.pod
+ 	pod2man --release=" " --date="October 2nd, 2003" --center="FreeRADIUS Daemon" --section=8 rlm_ippool_tool.pod > rlm_ippool_tool.8
diff -urN net/freeradius.orig/files/patch-src::modules::rlm_sql::rules.mak net/freeradius/files/patch-src::modules::rlm_sql::rules.mak
--- net/freeradius.orig/files/patch-src::modules::rlm_sql::rules.mak	Thu Jan  1 12:00:00 1970
+++ net/freeradius/files/patch-src::modules::rlm_sql::rules.mak	Sat Feb 19 15:09:08 2005
@@ -0,0 +1,11 @@
+--- src/modules/rlm_sql/drivers/rules.mak.orig	Sat Feb 19 15:07:59 2005
++++ src/modules/rlm_sql/drivers/rules.mak	Sat Feb 19 15:08:22 2005
+@@ -93,7 +93,7 @@
+ $(TARGET).la: $(DYNAMIC_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+ 	-module $(LINK_MODE) $(CFLAGS) \
+-	$(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS)
++	$(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(LDFLAGS) $(RLM_SQL_LIBS)
+ 
+ #######################################################################
+ #
diff -urN net/freeradius.orig/files/patch-src::modules::rules.mak net/freeradius/files/patch-src::modules::rules.mak
--- net/freeradius.orig/files/patch-src::modules::rules.mak	Thu Jan  1 12:00:00 1970
+++ net/freeradius/files/patch-src::modules::rules.mak	Sat Feb 19 14:46:00 2005
@@ -0,0 +1,11 @@
+--- src/modules/rules.mak.orig	Sat Feb 19 14:43:30 2005
++++ src/modules/rules.mak	Sat Feb 19 14:45:14 2005
+@@ -95,7 +95,7 @@
+ 
+ $(TARGET).la: $(DYNAMIC_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+-	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \
++	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \
+ 	-o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
+ 
+ #######################################################################

>Release-Note:
>Audit-Trail:
>Unformatted: