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).

25 files changed, 24 insertions, 29 deletions

diff --git a/devel/codecrusader/Makefile b/devel/codecrusader/Makefile
index cd7d03c..deed7c4 100644
--- 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>
diff --git a/editors/vim-lite/Makefile b/editors/vim-lite/Makefile
index da7edbc..bc751b1 100644
--- 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"
diff --git a/graphics/gfont/Makefile b/graphics/gfont/Makefile
index 8242189..bca7019 100644
--- 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>
diff --git a/graphics/killustrator/Makefile b/graphics/killustrator/Makefile
index 79e3f32..c4774d8 100644
--- 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>
diff --git a/graphics/kplot3d/Makefile b/graphics/kplot3d/Makefile
index 0072d8e..bb2dd82 100644
--- 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>
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index 15c7259..1c47304 100644
--- 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>
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 2cdd62f..395035d 100644
--- 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>
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index 2cdd62f..395035d 100644
--- 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>
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index 1c8b385..d1fb5ba 100644
--- 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>
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index e52b07b..6ec87cc 100644
--- 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>
diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index 227f50d..354971d 100644
--- 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>
diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 3e90652..fe2b887 100644
--- 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>
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index 14d739b..ccdfa2a 100644
--- 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>
diff --git a/news/pan/Makefile b/news/pan/Makefile
index d0f47b8..b0c81ea 100644
--- 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>
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index d0f47b8..b0c81ea 100644
--- 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>
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 4f31666..a81cfb0 100644
--- 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>
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index 9f482ba..351cb91 100644
--- 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>
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 9f482ba..351cb91 100644
--- 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>
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index e1db755..4132fb3 100644
--- 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>
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index e1db755..4132fb3 100644
--- 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>
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 2275984..e11c90b 100644
--- 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>
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 2275984..e11c90b 100644
--- 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>
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 4f31666..a81cfb0 100644
--- 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>
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 2551a1d6..5c6e61a 100644
--- 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>
diff --git a/www/kdreamsite/Makefile b/www/kdreamsite/Makefile
index 116e403..140c83e 100644
--- 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>