From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 20 06:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C410D1065676 for ; Sat, 20 Jun 2009 06:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9E32F8FC0A for ; Sat, 20 Jun 2009 06:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5K6o2wk007189 for ; Sat, 20 Jun 2009 06:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5K6o2jc007188; Sat, 20 Jun 2009 06:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 20 Jun 2009 06:50:02 GMT Resent-Message-Id: <200906200650.n5K6o2jc007188@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sahil Tandon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A51FB106564A for ; Sat, 20 Jun 2009 06:46:54 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 4A4F58FC1B for ; Sat, 20 Jun 2009 06:46:54 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5K6krkk021232 for ; Sat, 20 Jun 2009 06:46:53 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n5K6krBo021231; Sat, 20 Jun 2009 06:46:53 GMT (envelope-from nobody) Message-Id: <200906200646.n5K6krBo021231@www.freebsd.org> Date: Sat, 20 Jun 2009 06:46:53 GMT From: Sahil Tandon To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/135858: [PATCH] ports-mgmt/portlint: Tweak existing features + add GNU_CONFIGURE/HAS_CONFIGURE warning + refine Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2009 06:50:03 -0000 >Number: 135858 >Category: ports >Synopsis: [PATCH] ports-mgmt/portlint: Tweak existing features + add GNU_CONFIGURE/HAS_CONFIGURE warning + refine Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jun 20 06:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sahil Tandon >Release: 7.1-RELEASE >Organization: >Environment: FreeBSD internal.hamla.org 7.1-RELEASE FreeBSD 7.1-RELEASE #0: >Description: - Throw warning if HAS_CONFIGURE and GNU_CONFIGURE are both set - Check for redundant --prefix and --build in CONFIGURE_ARGS when GNU_CONFIGURE is set - Remove pkg-plist; instead, define PLIST_FILES and PORTEXAMPLES in Makefile - Modify Makefile to respect NOPORTEXAMPLES - Bump PORTVERSION >How-To-Repeat: >Fix: CVS diff attached. Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/ports-mgmt/portlint/Makefile,v retrieving revision 1.132 diff -u -r1.132 Makefile --- Makefile 23 May 2009 19:07:32 -0000 1.132 +++ Makefile 20 Jun 2009 06:35:03 -0000 @@ -8,7 +8,7 @@ # PORTNAME= portlint -PORTVERSION= 2.11.2 +PORTVERSION= 2.11.3 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none @@ -24,6 +24,10 @@ MAN1= portlint.1 +PLIST_FILES= bin/portlint + +PORTEXAMPLES= portlintgrep + do-fetch: @${DO_NADA} @@ -32,13 +36,14 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/portlint.pl - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \ - ${WRKSRC}/portlintgrep.pl + @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/portlintgrep.pl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/portlint.pl ${PREFIX}/bin/portlint ${INSTALL_MAN} ${WRKSRC}/portlint.1 ${MAN1PREFIX}/man/man1 - ${MKDIR} ${EXAMPLESDIR} +.if !defined(NOPORTEXAMPLES) + ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/portlintgrep.pl ${EXAMPLESDIR}/portlintgrep +.endif .include Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- pkg-plist 17 Nov 2003 21:19:02 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -bin/portlint -%%EXAMPLESDIR%%/portlintgrep -@dirrm %%EXAMPLESDIR%% Index: src/portlint.pl =================================================================== RCS file: /home/ncvs/ports/ports-mgmt/portlint/src/portlint.pl,v retrieving revision 1.109 diff -u -r1.109 portlint.pl --- src/portlint.pl 23 May 2009 19:07:32 -0000 1.109 +++ src/portlint.pl 20 Jun 2009 06:35:05 -0000 @@ -1936,13 +1936,13 @@ } # - # whole file: check for --mandir and --infodir when GNU_CONFIGURE + # whole file: check for --build, --mandir, --infodir and --prefix when GNU_CONFIGURE # if (exists $makevar{GNU_CONFIGURE} && $makevar{GNU_CONFIGURE} ne '' && - $makevar{CONFIGURE_ARGS} =~ /--(man|info)dir/) { - &perror("WARN", $file, -1, "--mandir and --infodir are not needed ". - "in CONFIGURE_ARGS as they are already set in bsd.port.mk"); + $makevar{CONFIGURE_ARGS} =~ /--(prefix|build|(man|info)dir)/) { + &perror("WARN", $file, -1, "--build, --mandir, --infodir and --prefix ". + "are not needed in CONFIGURE_ARGS as they are already set in bsd.port.mk"); } # @@ -2823,12 +2823,20 @@ "INFO macro instead."); } + # check if HAS_CONFIGURE and GNU_CONFIGURE + if ($tmp =~ /\nGNU_CONFIGURE[?+]?=/ + && $tmp =~ /\n(HAS_CONFIGURE)[?+]?=/) { + &perror("WARN", $file, -1, "since you already have GNU_CONFIGURE, ". + "you don't need $1."); + } + # check USE_X11 and USE_IMAKE if ($tmp =~ /\nUSE_IMAKE[?+]?=/ && $tmp =~ /\n(USE_X11)[?+]?=/) { &perror("WARN", $file, -1, "since you already have USE_IMAKE, ". "you don't need $1."); } + # check USE_X11 and USE_IMAKE if ($newxdef && $tmp =~ /\nUSE_IMAKE[?+]?=/ && $tmp =~ /\n(USE_X_PREFIX)[?+]?=/) { >Release-Note: >Audit-Trail: >Unformatted: