diff options
| author | tron <tron> | 1999-04-24 23:19:05 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-04-24 23:19:05 +0000 |
| commit | 4ccdbb1da1562bd58eebc8e48c1ca9bc1fa287e7 (patch) | |
| tree | e57cc0cb6c0cd8bed101e43d7f2d02e21d6e8bea /net | |
| parent | f6544f9eaa0ff80979772b0d612bafc9b9542990 (diff) | |
| download | pkgsrc-4ccdbb1da1562bd58eebc8e48c1ca9bc1fa287e7.tar.gz | |
Use "INSTALL_TARGET" instead of custom "do-install" target and make sure
that installing the package second time will work.
Diffstat (limited to 'net')
| -rw-r--r-- | net/radius/Makefile | 38 | ||||
| -rw-r--r-- | net/radius/patches/patch-aa | 8 |
2 files changed, 13 insertions, 33 deletions
diff --git a/net/radius/Makefile b/net/radius/Makefile index c9628b7c842..b37f97e046d 100644 --- a/net/radius/Makefile +++ b/net/radius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1999/04/24 22:44:25 tron Exp $ +# $NetBSD: Makefile,v 1.5 1999/04/24 23:19:05 tron Exp $ # # Tempted to install another radius package? # @@ -20,20 +20,23 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.merit.edu/aaa/ DECOMPRESS_CMD= ${GZCAT} -f - DIST_SUBDIR= radius NO_WRKSUBDIR= yes +INSTALL_TARGET= man-install install util-install config-install -.include "../../mk/bsd.prefs.mk" +CFLAGS+= -DHAVE_SETVBUF -DNOSHADOW +MAKE_ENV+= RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \ + GNUZIP="`${ECHO} ${GZIP_CMD} | ${AWK} '{print $$1}'`" \ + INSTALL="${INSTALL} -c" RADDB_INSDIR=${EXAMPLE_DIR} -# XXX Kerberos IV support is know to be broken. -#.ifmake do-build +# XXX Kerberos IV support is known to be broken. #.if exists(/usr/lib/libkrb.a) && \ # (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4)) #CFLAGS+= -DM_KERB -I/usr/include/kerberosIV #RADLIBS= -lkrb -ldes #.endif -#.endif + +.include "../../mk/bsd.prefs.mk" post-extract: .for FILE in ${EXTRA_FILES} @@ -48,27 +51,4 @@ pre-patch: ${PATCH} -sp < rad.$${i}.diff ; \ done -EXAMPLE_DIR= ${PREFIX}/share/examples/radius - -do-install: - @cd ${WRKSRC} ; \ - ${MAKE} man-install ; \ - ${MAKE} install ; \ - ${MAKE} util-install ; \ - ${MKDIR} ${EXAMPLE_DIR} ; \ - ${MAKE} config-install RADDB_INSDIR=${EXAMPLE_DIR} - .include "../../mk/bsd.pkg.mk" - -.ifmake do-build -CFLAGS+= -DHAVE_SETVBUF -DNOSHADOW - -MAKE_ENV+= RADLIBS="${RADLIBS} -lskey" -MAKE_ENV+= LIBS=-lcrypt - -MAKE_ENV+= GNUZIP="`${ECHO} ${GZIP_CMD} | ${AWK} '{print $$1}'`" -.endif - -.ifmake do-install -MAKE_ENV+= INSTALL="${INSTALL} -c" -.endif diff --git a/net/radius/patches/patch-aa b/net/radius/patches/patch-aa index 6ae0a9fa6e6..0df0b60ac9c 100644 --- a/net/radius/patches/patch-aa +++ b/net/radius/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $ +$NetBSD: patch-aa,v 1.2 1999/04/24 23:19:05 tron Exp $ ---- Makefile.orig Sun Mar 21 19:50:53 1999 -+++ Makefile Sun Mar 21 19:51:44 1999 +--- Makefile.orig Sun Apr 25 01:03:24 1999 ++++ Makefile Sun Apr 25 01:08:39 1999 @@ -51,11 +51,11 @@ # Where the configuration files live. RADDB = ./raddb @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/22 03:15:09 kim Exp $ +DAEMON_INSDIR = ${PREFIX}/sbin +BIN_INSDIR = ${PREFIX}/sbin +MAN_INSDIR = ${PREFIX}/man -+RADDB_INSDIR = /etc/raddb ++RADDB_INSDIR = ${PREFIX}/share/examples/radius +RADACCT_INSDIR = /var/log # The server does not need to be owned by root, unless some shadow password # scheme needs it. You might create a user id "radius" for just this purpose. |