Don't include bsd.port.pre.mk twice. This usually is caused by first

including bsd.port.pre.mk and then later including bsd.port.mk (the latter of which of course should be bsd.port.post.mk).
2000-01-07 16:40:17 +00:00
parent 3b1084476a
commit 2ca1fe047a
25 changed files with 24 additions and 29 deletions
--- a/devel/codecrusader/Makefile
+++ b/devel/codecrusader/Makefile
@@ -94,4 +94,4 @@ do-install:
 post-install:
 		@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/editors/vim-lite/Makefile
+++ b/editors/vim-lite/Makefile
@@ -11,11 +11,6 @@ PKGNAME=	vim-lite-5.3

 LITE=		yes

-.include <bsd.port.pre.mk>
-.if exists(${.CURDIR}/../vim5)
 MASTERDIR=	${.CURDIR}/../vim5
-.else
-MASTERDIR=	${PORTSDIR}/editors/vim5
-.endif

 .include "${MASTERDIR}/Makefile"
--- a/graphics/gfont/Makefile
+++ b/graphics/gfont/Makefile
@@ -25,4 +25,4 @@ GNU_CONFIGURE=	yes

 MAN1=		gfont.1

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/graphics/killustrator/Makefile
+++ b/graphics/killustrator/Makefile
@@ -27,4 +27,4 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 BROKEN=		"Requires NEWGCC-compiled KDE libs"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/graphics/kplot3d/Makefile
+++ b/graphics/kplot3d/Makefile
@@ -25,4 +25,4 @@ USE_GMAKE=	yes
 BROKEN=		"Obsolete compiler"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -126,4 +126,4 @@ post-install:
 	@${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -33,4 +33,4 @@ post-patch:
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -33,4 +33,4 @@ post-patch:
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -34,4 +34,4 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/wmpop3 && ${CHMOD} a+rx ${PREFIX}/share/doc/wmpop3
 	@${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/README ${PREFIX}/share/doc/wmpop3

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -88,4 +88,4 @@ do-install:
 	${INSTALL} -c -m 644 -o ${CLIENTUID} -g ${CLIENTGID} ${WRKDIR}/dnetc.ini ${BINDIR}
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -48,4 +48,4 @@ do-install:
 	${CHMOD} 755 ${BINDIR}
 	${LN} -s ${BINDIR}proxyper.sh ${LIBDIR}proxyper.sh

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -31,4 +31,4 @@ pre-install:
 	@${ECHO} "*********************************************************"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -57,4 +57,4 @@ MAN8=		afpd.8 atalkd.8 papd.8 psf.8
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -37,4 +37,4 @@ pre-fetch:
 	@${ECHO}
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -37,4 +37,4 @@ pre-fetch:
 	@${ECHO}
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -47,4 +47,4 @@ post-install:
 		@${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!"
 		@${ECHO} "=========================================================="

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -36,4 +36,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -36,4 +36,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -33,4 +33,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -33,4 +33,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -37,4 +37,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -37,4 +37,4 @@ GNU_CONFIGURE=	yes
 BROKEN=		"Can't be built successfully in -CURRENT"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -47,4 +47,4 @@ post-install:
 		@${ECHO} "The syntax of nessusd.users and nessusd.rules has changed!"
 		@${ECHO} "=========================================================="

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -152,4 +152,4 @@ post-install:
 	@${ECHO_MSG} ">> need to update it to work with OpenSSH."
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/www/kdreamsite/Makefile
+++ b/www/kdreamsite/Makefile
@@ -23,4 +23,4 @@ USE_GMAKE=	yes
 BROKEN=		"obsolete compiler"
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>