diff options
| author | Joerg Wunsch <joerg@FreeBSD.org> | 2005-04-07 12:22:04 +0000 |
|---|---|---|
| committer | Joerg Wunsch <joerg@FreeBSD.org> | 2005-04-07 12:22:04 +0000 |
| commit | c8da6086a1dd25462c1ab5ad2b573903ac711b82 (patch) | |
| tree | 24e3f95f1c9d91b9b18e70cac8bd4af4853901df /net/openradius | |
| parent | 76c4f3d59111f2e1a7b98b18a68dae365efae50d (diff) | |
| download | ports-c8da6086a1dd25462c1ab5ad2b573903ac711b82.tar.gz ports-c8da6086a1dd25462c1ab5ad2b573903ac711b82.zip | |
Unbreak the port for 5.x (and above). The wondersome makefile
infastructure of openradius uses the ARCH macro in order to run ar(1).
As FreeBSD's make(1) predefines ARCH to the architecture, this broke
compilation. Fix this by (ab)using the AR macro instead.
As the maintainer timed out on fixing this by about half a year, and I
need the port right now, I take the liberty to ignore the maintainer
bit here.
Notes
Notes:
svn path=/head/; revision=132686
Diffstat (limited to 'net/openradius')
| -rw-r--r-- | net/openradius/Makefile | 8 | ||||
| -rw-r--r-- | net/openradius/files/patch-aa | 22 | ||||
| -rw-r--r-- | net/openradius/pkg-plist | 1 | ||||
| -rw-r--r-- | net/openradius/scripts/configure | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/net/openradius/Makefile b/net/openradius/Makefile index ed2031b40234..56ce26c935a7 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -20,13 +20,7 @@ CC?= gcc CXX?= g++ USE_GMAKE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Broken by make(1) changes on FreeBSD >= 5.x" -.endif - post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/openradius/files/patch-aa b/net/openradius/files/patch-aa new file mode 100644 index 000000000000..f4797e38c759 --- /dev/null +++ b/net/openradius/files/patch-aa @@ -0,0 +1,22 @@ +--- language/Rules.mk.orig Thu Jan 9 11:18:53 2003 ++++ language/Rules.mk Thu Apr 7 14:06:31 2005 +@@ -31,7 +31,7 @@ + $(COMP) + + $(d)/language.a: $(LIBOBJS_$(d)) +- $(ARCH) ++ $(AR) + + $(d)/langtest: $(TSTOBJS_$(d)) common/common.a + $(LINK) +--- common/Rules.mk.orig Sun Feb 23 14:32:14 2003 ++++ common/Rules.mk Thu Apr 7 14:05:54 2005 +@@ -29,7 +29,7 @@ + $(OBJS_$(d)): $(d)/platform.h + + $(d)/common.a: $(OBJS_$(d)) +- $(ARCH) ++ $(AR) + + $(d)/platform.h: $(d)/Rules.mk + $(DEFHDR) $@ $(S_CF_U_INT32_T) $(S_CF_VSNPRINTF) $(S_CF_SYSLOG) diff --git a/net/openradius/pkg-plist b/net/openradius/pkg-plist index 273d4b99eac0..eea128c0c813 100644 --- a/net/openradius/pkg-plist +++ b/net/openradius/pkg-plist @@ -40,6 +40,7 @@ etc/openradius/subdicts/dict.ascend lib/openradius/ascfile lib/openradius/delay lib/openradius/radclient +lib/openradius/radldap lib/openradius/radlogger lib/openradius/radsql lib/openradius/unixpasswd diff --git a/net/openradius/scripts/configure b/net/openradius/scripts/configure index 2454fc22bf44..1e05a6e1a85a 100644 --- a/net/openradius/scripts/configure +++ b/net/openradius/scripts/configure @@ -57,7 +57,7 @@ LL_RADLDAP = -lldap -llber CMPLR = ./build/ccd-gcc DEFHDR = ./build/hdr INST = ./build/install -ARCH = ar rc \$@ \$^ +AR = ar rc \$@ \$^ # COMP = \$(CMPLR) \$(CF_ALL) \$(CF_TGT) -o \$@ -c \$< LINK = \$(CMPLR) \$(LF_ALL) \$(LF_TGT) -o \$@ \$^ \$(LL_TGT) \$(LL_ALL) |