diff --git a/www/squid_radius_auth/Makefile b/www/squid_radius_auth/Makefile index 53e7bd35ac81..e08e758ca8cd 100644 --- a/www/squid_radius_auth/Makefile +++ b/www/squid_radius_auth/Makefile @@ -1,16 +1,21 @@ PORTNAME= squid_radius_auth PORTVERSION= 1.10 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/contrib/squid_radius_auth/ MAINTAINER= ports@FreeBSD.org COMMENT= RADIUS authenticator for squid proxy 2.5 and later WWW= http://www.squid-cache.org/contrib/squid_radius_auth -.include +MAKE_ENV= BINDIR=${PREFIX}/libexec/squid \ + CONFDIR=${PREFIX}/etc/squid \ + MANDIR=${PREFIX}/share/man/man8 +ALL_TARGET= ALL post-patch: - ${REINPLACE_CMD} 's|= gcc|?= gcc|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} 's|PREFIX = /usr/local|PREFIX = ${PREFIX}|' ${WRKSRC}/Make.inc + @${REINPLACE_CMD} -E '/^(CC|CFLAGS|LDFLAGS)/s/=/?=/' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E '/^(PREFIX|BINDIR|CONFDIR|MANDIR)/s/=/?=/' \ + ${WRKSRC}/Make.inc -.include +.include diff --git a/www/squid_radius_auth/files/patch-Make.inc b/www/squid_radius_auth/files/patch-Make.inc deleted file mode 100644 index 06c9cae1a512..000000000000 --- a/www/squid_radius_auth/files/patch-Make.inc +++ /dev/null @@ -1,22 +0,0 @@ ---- Make.inc.orig 2008-06-10 08:48:03.000000000 -0500 -+++ Make.inc 2008-06-10 08:49:11.000000000 -0500 -@@ -3,15 +3,15 @@ - # - # - --PREFIX = /usr/local/squid --BINDIR = $(PREFIX)/libexec/ -+PREFIX = /usr/local -+BINDIR = $(PREFIX)/libexec/squid/ - MANDIR = $(PREFIX)/man/man8 - MANEXT = .8 --CONFDIR = $(PREFIX)/etc -+CONFDIR = $(PREFIX)/etc/squid/ - - INCLUDES = radius.h md5.h - --ALL: squid_radius_auth -+all: squid_radius_auth - - - attrprint.o: attrprint.c $(INCLUDES) diff --git a/www/squid_radius_auth/pkg-plist b/www/squid_radius_auth/pkg-plist index c20eadbd186c..430167fc4183 100644 --- a/www/squid_radius_auth/pkg-plist +++ b/www/squid_radius_auth/pkg-plist @@ -1,4 +1,3 @@ -etc/squid/squid_radius_auth.conf -etc/squid/squid_radius_auth.conf.default +@sample etc/squid/squid_radius_auth.conf etc/squid/squid_radius_auth.conf.default libexec/squid/squid_radius_auth -man/man8/squid_radius_auth.8.gz +share/man/man8/squid_radius_auth.8.gz