- Fix build with WITH_CANLOCK option set.

- Fix build with FORCE_MAKE_JOBS by enforcing use of GNU make.

PR:		ports/158805
Submitted by:	mandree

1 files changed, 5 insertions, 10 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 22a97cd6675a..935fb625b5eb 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -62,6 +62,7 @@ CONFIGURE_ARGS+=--with-nntp-default-server=news \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-mime-default-charset=US-ASCII \
 		--enable-ipv6
+MAKE_ARGS+=	MAKE=${GMAKE}
 CFLAGS+=	-DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
@@ -96,6 +97,10 @@ RUN_DEPENDS+=		metamail:${PORTSDIR}/mail/metamail
 CONFIGURE_ARGS+=	--with-metamail=${PREFIX}/bin/metamail
 .endif
 
+.ifdef	WITH_CANLOCK
+CONFIGURE_ARGS+=	--enable-cancel-locks
+.endif
+
 .ifdef	WITHOUT_NLS
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
@@ -123,16 +128,6 @@ post-patch:
 	${MV}   ${WRKSRC}/tools/url_handler.pl \
 		${WRKSRC}/tools/tinurl_handler.pl
 
-.ifdef	WITH_CANLOCK
-MAKE_ARGS+=	CANLIB='-L../libcanlock -lcanlock' \
-		CANLOCK=-DUSE_CANLOCK
-.endif
-
-pre-build:
-.ifdef	WITH_CANLOCK
-	cd ${WRKSRC}/src; ${GMAKE} canlock
-.endif
-
 post-build:
 .ifndef	WITHOUT_NLS
 	cd ${WRKSRC}/po; ${GMAKE}