Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5810B7A106 for ; Sun, 10 Jul 2016 07:46:31 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0A76785ED7; Sun, 10 Jul 2016 07:46:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 90D9385E73 for ; Sun, 10 Jul 2016 07:46:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id D6a2DN6p1FHC for ; Sun, 10 Jul 2016 07:46:29 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DB0C984CF0 for ; Sun, 10 Jul 2016 07:46:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D447DFBB5; Sun, 10 Jul 2016 07:46:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146813678987950" MIME-Version: 1.0 Date: Sun, 10 Jul 2016 07:46:29 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/doc/guide/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20160710074629.D447DFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146813678987950 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sun Jul 10 07:46:29 UTC 2016 Modified Files: pkgsrc/doc/guide/files: buildlink.xml bulk.xml components.xml faq.xml fixes.xml plist.xml regression.xml Log Message: detab To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/doc/guide/files/buildlink.xml cvs rdiff -u -r1.22 -r1.23 pkgsrc/doc/guide/files/bulk.xml cvs rdiff -u -r1.52 -r1.53 pkgsrc/doc/guide/files/components.xml cvs rdiff -u -r1.53 -r1.54 pkgsrc/doc/guide/files/faq.xml cvs rdiff -u -r1.141 -r1.142 pkgsrc/doc/guide/files/fixes.xml cvs rdiff -u -r1.23 -r1.24 pkgsrc/doc/guide/files/plist.xml cvs rdiff -u -r1.3 -r1.4 pkgsrc/doc/guide/files/regression.xml Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146813678987950 Content-Disposition: inline Content-Length: 6923 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/guide/files/buildlink.xml diff -u pkgsrc/doc/guide/files/buildlink.xml:1.38 pkgsrc/doc/guide/files/buildlink.xml:1.39 --- pkgsrc/doc/guide/files/buildlink.xml:1.38 Tue Dec 30 15:18:59 2014 +++ pkgsrc/doc/guide/files/buildlink.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + Buildlink methodology @@ -206,20 +206,20 @@ BUILDLINK_API_DEPENDS.foo+= foo>=1.1.0 # $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_TREE+= tiff +BUILDLINK_TREE+= tiff .if !defined(TIFF_BUILDLINK3_MK) TIFF_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1 -BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.7.2nb1 -BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff +BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1 +BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.7.2nb1 +BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .endif # TIFF_BUILDLINK3_MK -BUILDLINK_TREE+= -tiff +BUILDLINK_TREE+= -tiff The header and footer manipulate Index: pkgsrc/doc/guide/files/bulk.xml diff -u pkgsrc/doc/guide/files/bulk.xml:1.22 pkgsrc/doc/guide/files/bulk.xml:1.23 --- pkgsrc/doc/guide/files/bulk.xml:1.22 Sun Jul 10 07:43:23 2016 +++ pkgsrc/doc/guide/files/bulk.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + Creating binary packages for everything in pkgsrc (bulk @@ -115,10 +115,10 @@ Create a user with name "pbulk".</para> apply to packages you build. For instance,</para> <programlisting> -PKG_DEVELOPER= yes # perform more checks -X11_TYPE= modular # use pkgsrc X11 -SKIP_LICENSE_CHECK= yes # accept all licences (useful - # when building all packages) +PKG_DEVELOPER= yes # perform more checks +X11_TYPE= modular # use pkgsrc X11 +SKIP_LICENSE_CHECK= yes # accept all licences (useful + # when building all packages) </programlisting> </note> <!-- Think how to merge this or maintain short reference of useful settings. Index: pkgsrc/doc/guide/files/components.xml diff -u pkgsrc/doc/guide/files/components.xml:1.52 pkgsrc/doc/guide/files/components.xml:1.53 --- pkgsrc/doc/guide/files/components.xml:1.52 Sat Jun 11 14:58:26 2016 +++ pkgsrc/doc/guide/files/components.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ -<!-- $NetBSD: components.xml,v 1.52 2016/06/11 14:58:26 rillig Exp $ --> +<!-- $NetBSD: components.xml,v 1.53 2016/07/10 07:46:29 rillig Exp $ --> <chapter id="components"> <?dbhtml filename="components.html"?> <title>Package components - files, directories and contents @@ -435,7 +435,7 @@ monitor_file(...) int fd = kqueue(); ... #else - ... + ... #endif } Index: pkgsrc/doc/guide/files/faq.xml diff -u pkgsrc/doc/guide/files/faq.xml:1.53 pkgsrc/doc/guide/files/faq.xml:1.54 --- pkgsrc/doc/guide/files/faq.xml:1.53 Sat Jun 11 14:58:26 2016 +++ pkgsrc/doc/guide/files/faq.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + Frequently Asked Questions @@ -261,7 +261,7 @@ provide FETCH_CMD, -FETCH_USING= wget +FETCH_USING= wget Index: pkgsrc/doc/guide/files/fixes.xml diff -u pkgsrc/doc/guide/files/fixes.xml:1.141 pkgsrc/doc/guide/files/fixes.xml:1.142 --- pkgsrc/doc/guide/files/fixes.xml:1.141 Sat Jul 9 16:19:15 2016 +++ pkgsrc/doc/guide/files/fixes.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + Making your package work @@ -1409,13 +1409,13 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2 binary: -USE_GAMESGROUP= yes +USE_GAMESGROUP= yes -BUILD_DEFS+= VARBASE +BUILD_DEFS+= VARBASE -OWN_DIRS_PERMS+= ${VARBASE}/games/moon-buggy ${GAMEDIR_PERMS} -REQD_FILES_PERMS+= /dev/null ${VARBASE}/games/moon-buggy/mbscore ${GAMEDATA_PERMS} -SPECIAL_PERMS+= ${PREFIX}/bin/moon-buggy ${SETGID_GAMES_PERMS} +OWN_DIRS_PERMS+= ${VARBASE}/games/moon-buggy ${GAMEDIR_PERMS} +REQD_FILES_PERMS+= /dev/null ${VARBASE}/games/moon-buggy/mbscore ${GAMEDATA_PERMS} +SPECIAL_PERMS+= ${PREFIX}/bin/moon-buggy ${SETGID_GAMES_PERMS} Various INSTALL_* variables are also available: Index: pkgsrc/doc/guide/files/plist.xml diff -u pkgsrc/doc/guide/files/plist.xml:1.23 pkgsrc/doc/guide/files/plist.xml:1.24 --- pkgsrc/doc/guide/files/plist.xml:1.23 Sat Jul 9 16:07:35 2016 +++ pkgsrc/doc/guide/files/plist.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + PLIST issues @@ -145,9 +145,9 @@ PLIST_SUBST+= SOMEVAR="somevalue" For example, in Makefile: -PLIST_VARS+= foo +PLIST_VARS+= foo .if condition -PLIST.foo= yes +PLIST.foo= yes .else Index: pkgsrc/doc/guide/files/regression.xml diff -u pkgsrc/doc/guide/files/regression.xml:1.3 pkgsrc/doc/guide/files/regression.xml:1.4 --- pkgsrc/doc/guide/files/regression.xml:1.3 Sat Jun 11 13:28:09 2016 +++ pkgsrc/doc/guide/files/regression.xml Sun Jul 10 07:46:29 2016 @@ -1,4 +1,4 @@ - + Regression tests @@ -62,7 +62,7 @@ do_test() { - echo "Example output" + echo "Example output" } 1>$TEST_OUTFILE 2>&1 @@ -77,10 +77,10 @@ do_test() { check_result() { - exit_status 0 - output_require "Example" - output_require "^[[:alpha:]+[[:space:]][[:alpha:]]{6}$" - output_prohibit "no such file or directory" + exit_status 0 + output_require "Example" + output_require "^[[:alpha:]+[[:space:]][[:alpha:]]{6}$" + output_prohibit "no such file or directory" } --_----------=_146813678987950--