inn: Remove variables already defined in Makefile.common

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Sep 6 12:19:54 2019 +0200
Changeset:	b2890d2042eaf7e78d57feedc3d442d4f54e3740

Modified Files:
	inn/Makefile

Log Message:
inn: Remove variables already defined in Makefile.common

Move up tools stuff more to the beginning in Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2890d2042eaf7e78d57feedc3d442d4f54e3740

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 inn/Makefile | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diffs:
diff --git a/inn/Makefile b/inn/Makefile
index b3a0849071..ee3b619218 100644
--- a/inn/Makefile
+++ b/inn/Makefile
@@ -14,21 +14,17 @@ LICENSE=		modified-bsd AND gnu-gpl-v2
 
 CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 
-.include "../../news/inn/Makefile.common"
-
-# Already done in Makefile.common
-#BUILD_DEFS+=		INN_DATA_DIR
-BUILD_DEFS+=		VARBASE
+USE_TOOLS+=		awk egrep gzip perl:run sed sh sort yacc
+USE_LIBTOOL=		yes
+REPLACE_PERL+=		tests/docs/pod.t
 
-FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR}
+.include "../../news/inn/Makefile.common"
 
 BUILD_DEFS+=		INN_PATHBIN
+FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR}
 FILES_SUBST+=		INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q}
-
 MESSAGE_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
-
 PLIST_SUBST+=		INN_PATHBIN=${INN_PATHBIN:Q}
-
 PKG_SYSCONFSUBDIR=	inn
 
 GNU_CONFIGURE=		YES
@@ -58,10 +54,7 @@ CONFIGURE_ENV+=		_PATH_SED=${TOOLS_SED}
 CONFIGURE_ENV+=		_PATH_SH=${TOOLS_SH}
 CONFIGURE_ENV+=		_PATH_SORT=${TOOLS_SORT}
 CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD}
-USE_TOOLS+=		awk egrep gzip perl:run sed sh sort yacc
-USE_LIBTOOL=		yes
 
-REPLACE_PERL+=		tests/docs/pod.t
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
 # Modify GnuPG path to ${PREFIX} in pgpverify Perl script