ports/158805: [PATCH] news/tin: fix WITH_CANLOCK build

[Matthias Andree]

>Number:         158805
>Category:       ports
>Synopsis:       [PATCH] news/tin: fix WITH_CANLOCK build
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 11 14:50:03 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 8.2-STABLE FreeBSD 8.2-STABLE #6: Fri Jul  8 05:16:49 CEST
>Description:
Johan,

news/tin no longer builds WITH_CANLOCK=true, since there is no canlock
directory any more. Also, the tin makefile invokes BSD make rather than
GNU make, which barfs with FORCE_MAKE_JOBS.

The attached patch fixes both problems without breaking WITH_CANLOCK.

I intend to commit if I don't hear back within 72 hours. Let me know
if you need more time.

Port maintainer (johans at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- tin-1.9.6.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/news/tin/Makefile,v
retrieving revision 1.153
diff -u -u -r1.153 Makefile
--- Makefile	9 Jul 2011 13:15:26 -0000	1.153
+++ Makefile	11 Jul 2011 14:34:48 -0000
@@ -62,6 +62,7 @@
 		--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 @@
 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 @@
 	${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}
--- tin-1.9.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: