6 files changed, 22 insertions, 15 deletions

diff --git a/news/husky-base/Makefile b/news/husky-base/Makefile
index 11d74e0cc13a..6069718c1c70 100644
--- a/news/husky-base/Makefile
+++ b/news/husky-base/Makefile
@@ -19,15 +19,9 @@ USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's^/usr/local^${PREFIX}^' \
-		-e 's^CFGDIR=/etc/fido^CFGDIR=${PREFIX}/etc/fido^' \
-		-e 's^# INFODIR=/usr/local/info^INFODIR=${PREFIX}/info^' \
-		-e 's^#HTMLDIR=$$(PREFIX)/lib/husky^HTMLDIR=${PREFIX}/share/doc/husky^' \
-		-e 's^$$(CFGDIR)/msged.cfg^~/.msged^' \
-		-e 's^CC=gcc^CC=${CC}^' \
-		-e 's^CXX=g++^CXX=${CXX}^' \
-		-e 's^MKSHARED=gcc^MKSHARED=${CC}^' \
-		-e 's^OPTCFLAGS=^OPTCFLAGS=-c ${CFLAGS}^' \
+		-e 's^CFGDIR=/etc/fido^CFGDIR=$$(PREFIX)/etc/fido^' \
+		-e 's^# INFODIR=/usr/local^INFODIR=$$(PREFIX)^' \
+		-e 's^#HTMLDIR=$$(PREFIX)/lib/husky^HTMLDIR=$$(PREFIX)/share/doc/husky^' \
 			${WRKSRC}/huskymak.cfg
 
 pre-install:
diff --git a/news/husky-base/Makefile.inc b/news/husky-base/Makefile.inc
index 867a175a2259..d42808f66fba 100644
--- a/news/husky-base/Makefile.inc
+++ b/news/husky-base/Makefile.inc
@@ -15,6 +15,17 @@ BUILD_DEPENDS=	${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base
 
 USE_GMAKE=	yes
 
+MAKE_ARGS+=	PREFIX="${PREFIX}" \
+		CC="${CC}" CXX="${CXX}" GPP="${CXX}" MKSHARED="${CC}" \
+		OPTCFLAGS="-c ${CFLAGS}" WARNFLAGS=""
+
+.if !defined(WITHOUT_PERL)
+MAKE_ARGS+=	PERL=1
+USE_PERL5=	yes
+.else
+MAKE_ARGS+=	PERL=0
+.endif
+
 pre-build:
 	@${LN} -sf ${LOCALBASE}/etc/fido/huskymak.cfg ${WRKDIR}
 .endif
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index 0149998c7fca..25d52b4d1592 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -29,10 +29,10 @@ post-patch:
 		${WRKSRC}/man/txt2pkt.1
 
 post-build:
-	@cd ${WRKSRC}/doc && ${GMAKE}
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all
 
 post-install:
-	@cd ${WRKSRC}/doc && ${GMAKE} install
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/news/husky-base/Makefile.inc"
diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick-devel/Makefile
index 5e1380822461..e134ae65d074 100644
--- a/news/husky-htick-devel/Makefile
+++ b/news/husky-htick-devel/Makefile
@@ -24,10 +24,10 @@ post-patch:
 		${WRKSRC}/man/htick.1
 
 post-build:
-	@cd ${WRKSRC}/doc && ${GMAKE}
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all
 
 post-install:
-	@cd ${WRKSRC}/doc && ${GMAKE} install
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/news/husky-base/Makefile.inc"
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 5e1380822461..e134ae65d074 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -24,10 +24,10 @@ post-patch:
 		${WRKSRC}/man/htick.1
 
 post-build:
-	@cd ${WRKSRC}/doc && ${GMAKE}
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} all
 
 post-install:
-	@cd ${WRKSRC}/doc && ${GMAKE} install
+	@cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/news/husky-base/Makefile.inc"
diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile
index bb5c8d3acfd5..484d9650c53e 100644
--- a/news/husky-msged/Makefile
+++ b/news/husky-msged/Makefile
@@ -17,6 +17,8 @@ LIB_DEPENDS=	fidoconfig.0:${PORTSDIR}/news/husky-fidoconf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+MAKE_ARGS=	MSGEDCFG="\\\"~/.msged\\\""
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/news/husky-base/Makefile.inc"
 .include <bsd.port.post.mk>