NetBSD Problem Report #18886

Received: (qmail 20226 invoked by uid 605); 2 Nov 2002 01:53:44 -0000
Message-Id: <21050-1036202024@rainier.reedmedia.net>
Date: Fri, 01 Nov 2002 17:53:44 -0800
From: reed@reedmedia.net
Sender: gnats-bugs-owner@netbsd.org
Reply-To: reed@reedmedia.net
To: gnats-bugs@gnats.netbsd.org
Subject: add customizable GNU prefix to pkgsrc
X-Send-Pr-Version: 3.95

>Number:         18886
>Category:       pkg
>Synopsis:       diffs for customizable GNU prefix for pkgsrc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 02 01:54:00 +0000 2002
>Closed-Date:    Wed Feb 26 14:00:29 +0000 2003
>Last-Modified:  Sat Mar 15 07:29:00 +0000 2003
>Originator:     
>Release:        NetBSD 1.6
>Organization:
http://bsd.reedmedia.net/
>Environment:


System: NetBSD rainier.reedmedia.net 1.6 NetBSD 1.6 (JCR-20020927) #3: Sat Sep 28 13:40:20 PDT 2002 reed@rainier.reedmedia.net:/usr/src/sys/arch/i386/compile/JCR-20020927 i386
Architecture: i386
Machine: i386
>Description:
Some packages have hard-coded "g" prefix. This is often not needed.
It would be nice to have this customizable.
>How-To-Repeat:
Install any of these packages via pkgsrc:
archivers/gsharutils
archivers/gtar-base
devel/gindent
devel/gmake
devel/m4
devel/patch
sysutils/fileutils
sysutils/findutils
sysutils/sh-utils
textproc/grep
textproc/gsed
textproc/textutils

>Fix:
Please fix the above files so they don't automatically use "g" prefix. 
(By the way, this wasn't my idea. But I couldn't find email
for Julien Letessier who proposed this a couple months ago.)

Some diffs follow. Purposely named "GNU_PROGRAM_PREFIX", because
I could imagine that it should be specific, so someone
didn't blindly assume for everything needing prefix like editors/nvi-m17n.

--- mk/bsd.pkg.mk.orig	Thu Oct 24 03:14:51 2002
+++ mk/bsd.pkg.mk	Fri Nov  1 16:36:44 2002
@@ -505,6 +505,13 @@
 DLIST=			${WRKDIR}/.DLIST
 DDIR=			${WRKDIR}/.DDIR

+# for setting prefix like gls or gtouch
+.if defined(GNU_PROGRAM_PREFIX)
+.  if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
+.  endif
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+.endif

 # Set PLIST_SUBST to substitute "${variable}" to "value" in PLIST
 PLIST_SUBST+=	OPSYS=${OPSYS}						\
--- mk/bsd.pkg.defaults.mk.orig	Fri Nov  1 16:32:28 2002
+++ mk/bsd.pkg.defaults.mk	Fri Nov  1 17:25:48 2002
@@ -389,6 +389,11 @@
 # Possible: Any local directory
 # Default: none

+GNU_PROGRAM_PREFIX?=g
+# This is the prefix to add for program prefix, like gls or gnutouch.
+# Possible, g, gnu, nothing, etc.
+# Default: g
+
 #
 #	Definitions used only in the packages collection
 #

--- archivers/gtar-base/Makefile.orig	Fri Nov  1 16:47:17 2002
+++ archivers/gtar-base/Makefile	Fri Nov  1 17:31:53 2002
@@ -14,7 +14,7 @@

 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--program-prefix=g --with-catgets
+CONFIGURE_ARGS+=	--with-catgets
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}

 .include "../../mk/bsd.prefs.mk"
@@ -30,6 +30,7 @@
 	@${ECHO} '' >>${WRKSRC}/po/fr.po

 post-install:
-	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/gtar.1
+	${INSTALL_DATA} ${FILESDIR}/gtar.1 \
+                        ${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}tar.1

 .include "../../mk/bsd.pkg.mk"
--- archivers/gtar-base/PLIST.orig	Fri Nov  1 16:49:06 2002
+++ archivers/gtar-base/PLIST	Fri Nov  1 16:48:31 2002
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST,v 1.2 2002/08/25 21:49:06 jlam Exp $
-bin/gtar
-man/man1/gtar.1
+bin/${GNU_PROGRAM_PREFIX}tar
+man/man1/${GNU_PROGRAM_PREFIX}tar.1
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.mo
--- archivers/gtar-base/PLIST.Darwin.orig	Fri Nov  1 17:38:00 2002
+++ archivers/gtar-base/PLIST.Darwin	Fri Nov  1 17:35:48 2002
@@ -1,3 +1,3 @@
 @comment $NetBSD: PLIST.Darwin,v 1.1 2001/12/27 21:50:57 agc Exp $
-bin/gtar
-man/man1/gtar.1
+bin/${GNU_PROGRAM_PREFIX}tar
+man/man1/${GNU_PROGRAM_PREFIX}tar.1
--- archivers/gtar-base/PLIST.NetBSD.orig	Fri Nov  1 17:38:31 2002
+++ archivers/gtar-base/PLIST.NetBSD	Fri Nov  1 17:36:14 2002
@@ -1,6 +1,6 @@
 @comment $NetBSD: PLIST.NetBSD,v 1.2 2002/08/25 21:49:07 jlam Exp $
-bin/gtar
-man/man1/gtar.1
+bin/${GNU_PROGRAM_PREFIX}tar
+man/man1/${GNU_PROGRAM_PREFIX}tar.1
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.cat
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.cat
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.cat

>Release-Note:
>Audit-Trail:

From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@gnats.netbsd.org
Cc:  
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Thu, 7 Nov 2002 15:53:10 -0800 (PST)

 The idea for mk/bsd.pkg.mk should be changed -- so it doesn't apply by
 default to set --program-prefix for every GNU_CONFIGURE package.

 This could be done two ways:
  1) forget the idea of doing it in mk/bsd.pkg.mk and just place in the
 code for each of these individual Makefiles:

 .if defined(GNU_PROGRAM_PREFIX) # assuming also using GNU_CONFIGURE
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 .endif

 2) Or add another setting like "USE_GNU_PROGRAM_PREFIX" and set to "yes"
 in each Makefile as appropriate AND in the mk/bsd.pkg.mk do

 .if defined(GNU_PROGRAM_PREFIX) && defined(USE_GNU_PROGRAM_PREFIX)
 .  if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 .  endif
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 .endif

 I can provide diffs to replace the "g"'s in all the PLISTs with
 "${GNU_PROGRAM_PREFIX}". Please let me know.


From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
To: "Jeremy C. Reed" <reed@reedmedia.net>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Sun, 24 Nov 2002 00:31:16 +0100

 On Fri, Nov 08, 2002 at 12:26:09AM -0000, Jeremy C. Reed wrote:
 >  2) Or add another setting like "USE_GNU_PROGRAM_PREFIX" and set to "yes"
 >  in each Makefile as appropriate AND in the mk/bsd.pkg.mk do
 >  
 >  .if defined(GNU_PROGRAM_PREFIX) && defined(USE_GNU_PROGRAM_PREFIX)
 >  .  if defined(GNU_CONFIGURE)
 >  CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 >  .  endif
 >  PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 >  .endif
 >  
 >  I can provide diffs to replace the "g"'s in all the PLISTs with
 >  "${GNU_PROGRAM_PREFIX}". Please let me know.

 This looks good -- please send me diffs, I'll try to apply them Monday
 or Tuesday.
  Thomas

 -- 
 Thomas Klausner - wiz@danbala.ifoer.tuwien.ac.at
 Main Rule of Usenet:  Never argue with idiots.  They drag you down to
 their level, then beat you with experience.

From: "Jeremy C. Reed" <reed@reedmedia.net>
To: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Fri, 20 Dec 2002 17:53:32 -0800 (PST)

 Sorry about the delay. I will begin sending you diffs. Thanks!



From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc:  
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Fri, 20 Dec 2002 18:17:27 -0800 (PST)

 gsharutils has patch for info documentation that says "gshar". But the
 info doc itself is named "sharutils.info". I think that the patch
 shouldn't change "shar" to "gshar". If the user is smart enough to realize
 that sharutils is gsharutils, they can figure it out.

 Also, should I send patches to the cvs or to wiz?


From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@gnats.netbsd.org
Cc:  
Subject: pr/18886 CVS commit: pkgsrc/mk
Date: Sun, 22 Dec 2002 03:23:51 +0200 (EET)

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Sun Dec 22 01:23:51 UTC 2002

 Modified Files:
 	pkgsrc/mk: bsd.pkg.defaults.mk

 Log Message:
 Add GNU_PROGRAM_PREFIX, defaulting to -g. See PR 18886 for details.


 To generate a diff of this commit:
 cvs rdiff -r1.112 -r1.113 pkgsrc/mk/bsd.pkg.defaults.mk

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.


From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
To: "Jeremy C. Reed" <reed@reedmedia.net>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Sun, 22 Dec 2002 02:49:40 +0100

 On Sat, Dec 21, 2002 at 02:18:03AM -0000, Jeremy C. Reed wrote:
 >  gsharutils has patch for info documentation that says "gshar". But the
 >  info doc itself is named "sharutils.info". I think that the patch
 >  shouldn't change "shar" to "gshar". If the user is smart enough to realize
 >  that sharutils is gsharutils, they can figure it out.

 Ok, undone.

 >  Also, should I send patches to the cvs or to wiz?

 Since I said I'd commit it... as you want, I'll get both.

 Bye,
  Thomas

 -- 
 Thomas Klausner - wiz@danbala.ifoer.tuwien.ac.at
 What is wanted is not the will to believe, but the will to find
 out, which is the exact opposite. -- Bertrand Russell

From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc:  
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Sat, 21 Dec 2002 19:26:31 -0800 (PST)

 For devel/m4 I have more comments.

 The patch-ab should be changed so it doesn't force "Gm4" because m4 is
 fine. (No patch provided by me.)

 Also, it has examples under share/examples/gm4/, but the package name is
 "m4" (no "g"). Shouldn't the package name be consistent with the name used
 in examples?

 The following patch may be wrong, because I think that the examples
 directory should always be hard-coded "m4". Comments?

 --- devel/m4/Makefile.orig	2002-12-21 19:17:32.000000000 -0800
 +++ devel/m4/Makefile	2002-11-21 18:29:21.000000000 -0800
 @@ -11,16 +11,20 @@

  USE_BUILDLINK2=		yes
  GNU_CONFIGURE=		yes
 -CONFIGURE_ARGS=		--program-prefix=g
  INFO_FILES=		m4.info
  TEXINFO_OVERRIDE=	YES

 +.if defined(GNU_PROGRAM_PREFIX)
 +CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 +.endif
 +PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 +
  pre-build:
  	${CHMOD} u+w ${WRKSRC}/checks/stamp-checks

  post-install:
 -	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gm4
 -	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4
 +	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${GNU_PROGRAM_PREFIX}m4
 +	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/${GNU_PROGRAM_PREFIX}m4

  .include "../../mk/texinfo.mk"
  .include "../../mk/bsd.pkg.mk"
 --- devel/m4/PLIST.orig	2002-12-21 19:17:32.000000000 -0800
 +++ devel/m4/PLIST	2002-11-21 18:43:15.000000000 -0800
 @@ -1,32 +1,32 @@
  @comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $
 -bin/gm4
 +bin/${GNU_PROGRAM_PREFIX}m4
  @unexec ${INSTALL_INFO} --delete %D/info/m4.info %D/info/dir
  info/m4.info
  @exec ${INSTALL_INFO} %D/info/m4.info %D/info/dir
 -share/examples/gm4/capitalize.m4
 -share/examples/gm4/comments.m4
 -share/examples/gm4/ddivert.m4
 -share/examples/gm4/debug.m4
 -share/examples/gm4/esyscmd.m4
 -share/examples/gm4/exp.m4
 -share/examples/gm4/file.m4
 -share/examples/gm4/foreach.m4
 -share/examples/gm4/forloop.m4
 -share/examples/gm4/fstab.m4
 -share/examples/gm4/hanoi.m4
 -share/examples/gm4/incl-test.m4
 -share/examples/gm4/include.m4
 -share/examples/gm4/indir.m4
 -share/examples/gm4/misc.m4
 -share/examples/gm4/multiquotes.m4
 -share/examples/gm4/patsubst.m4
 -share/examples/gm4/pushpop.m4
 -share/examples/gm4/regexp.m4
 -share/examples/gm4/reverse.m4
 -share/examples/gm4/sync-lines.m4
 -share/examples/gm4/sysv-args.m4
 -share/examples/gm4/trace.m4
 -share/examples/gm4/translit.m4
 -share/examples/gm4/undivert.m4
 -share/examples/gm4/wrap.m4
 -@dirrm share/examples/gm4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/capitalize.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/comments.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/ddivert.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/debug.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/esyscmd.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/exp.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/file.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/foreach.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/forloop.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/fstab.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/hanoi.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/incl-test.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/include.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/indir.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/misc.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/multiquotes.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/patsubst.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/pushpop.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/regexp.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/reverse.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/sync-lines.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/sysv-args.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/trace.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/translit.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/undivert.m4
 +share/examples/${GNU_PROGRAM_PREFIX}m4/wrap.m4
 +@dirrm share/examples/${GNU_PROGRAM_PREFIX}m4


From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc:  
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Sat, 21 Dec 2002 19:35:50 -0800 (PST)

 Now for devel/patch ...
 It had gpatch only for NetBSD. I would suggest ignoring NetBSD. But my
 patch still includes this NetBSD check.

 --- devel/patch/Makefile.orig	2002-12-20 18:36:34.000000000 -0800
 +++ devel/patch/Makefile	2002-12-21 19:32:08.000000000 -0800
 @@ -13,14 +13,10 @@

  .include "../../mk/bsd.prefs.mk"

 -.if ${OPSYS} == "NetBSD"
 -CONFIGURE_ARGS+=	--program-prefix=g
 -PROGRAM_PREFIX=		g
 -.else
 -PROGRAM_PREFIX=
 +.if ${OPSYS} == "NetBSD" && defined(GNU_PROGRAM_PREFIX)
 +CONFIGURE_ARGS+=        --program-prefix=${GNU_PROGRAM_PREFIX}
  .endif
 -
 -PLIST_SUBST+=		PROGRAM_PREFIX=${PROGRAM_PREFIX}
 +PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}

  do-patch:
  	${MV} ${WRKSRC}/pch.c ${WRKSRC}/pch.c.orig
 --- devel/patch/PLIST.orig	2002-12-20 18:36:34.000000000 -0800
 +++ devel/patch/PLIST	2002-11-05 13:38:20.000000000 -0800
 @@ -1,3 +1,3 @@
  @comment $NetBSD: PLIST,v 1.2 2001/12/04 09:14:41 seb Exp $
 -bin/${PROGRAM_PREFIX}patch
 -man/man1/${PROGRAM_PREFIX}patch.1
 +bin/${GNU_PROGRAM_PREFIX}patch
 +man/man1/${GNU_PROGRAM_PREFIX}patch.1




From: "Jeremy C. Reed" <reed@reedmedia.net>
To: gnats-bugs@netbsd.org
Cc:  
Subject: Re: pkg/18886: add customizable GNU prefix to pkgsrc
Date: Sat, 21 Dec 2002 20:01:29 -0800 (PST)

 The DESCR mentions gcat, but that is okay.

 --- textproc/textutils/PLIST.orig	2002-12-21 19:57:41.000000000 -0800
 +++ textproc/textutils/PLIST	2002-12-21 19:57:41.000000000 -0800
 @@ -1,60 +1,60 @@
  @comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $
 -bin/gcat
 -bin/gcksum
 -bin/gcomm
 -bin/gcsplit
 -bin/gcut
 -bin/gexpand
 -bin/gfmt
 -bin/gfold
 -bin/ghead
 -bin/gjoin
 -bin/gmd5sum
 -bin/gnl
 -bin/god
 -bin/gpaste
 -bin/gpr
 -bin/gptx
 -bin/gsort
 -bin/gsplit
 -bin/gsum
 -bin/gtac
 -bin/gtail
 -bin/gtr
 -bin/gtsort
 -bin/gunexpand
 -bin/guniq
 -bin/gwc
 +bin/${GNU_PROGRAM_PREFIX}cat
 +bin/${GNU_PROGRAM_PREFIX}cksum
 +bin/${GNU_PROGRAM_PREFIX}comm
 +bin/${GNU_PROGRAM_PREFIX}csplit
 +bin/${GNU_PROGRAM_PREFIX}cut
 +bin/${GNU_PROGRAM_PREFIX}expand
 +bin/${GNU_PROGRAM_PREFIX}fmt
 +bin/${GNU_PROGRAM_PREFIX}fold
 +bin/${GNU_PROGRAM_PREFIX}head
 +bin/${GNU_PROGRAM_PREFIX}join
 +bin/${GNU_PROGRAM_PREFIX}md5sum
 +bin/${GNU_PROGRAM_PREFIX}nl
 +bin/${GNU_PROGRAM_PREFIX}od
 +bin/${GNU_PROGRAM_PREFIX}paste
 +bin/${GNU_PROGRAM_PREFIX}pr
 +bin/${GNU_PROGRAM_PREFIX}ptx
 +bin/${GNU_PROGRAM_PREFIX}sort
 +bin/${GNU_PROGRAM_PREFIX}split
 +bin/${GNU_PROGRAM_PREFIX}sum
 +bin/${GNU_PROGRAM_PREFIX}tac
 +bin/${GNU_PROGRAM_PREFIX}tail
 +bin/${GNU_PROGRAM_PREFIX}tr
 +bin/${GNU_PROGRAM_PREFIX}tsort
 +bin/${GNU_PROGRAM_PREFIX}unexpand
 +bin/${GNU_PROGRAM_PREFIX}uniq
 +bin/${GNU_PROGRAM_PREFIX}wc
  @unexec ${INSTALL_INFO} --delete %D/info/textutils.info %D/info/dir
  info/textutils.info
  @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
  @exec ${INSTALL_INFO} %D/info/textutils.info %D/info/dir
 -man/man1/gcat.1
 -man/man1/gcksum.1
 -man/man1/gcomm.1
 -man/man1/gcsplit.1
 -man/man1/gcut.1
 -man/man1/gexpand.1
 -man/man1/gfmt.1
 -man/man1/gfold.1
 -man/man1/ghead.1
 -man/man1/gjoin.1
 -man/man1/gmd5sum.1
 -man/man1/gnl.1
 -man/man1/god.1
 -man/man1/gpaste.1
 -man/man1/gpr.1
 -man/man1/gptx.1
 -man/man1/gsort.1
 -man/man1/gsplit.1
 -man/man1/gsum.1
 -man/man1/gtac.1
 -man/man1/gtail.1
 -man/man1/gtr.1
 -man/man1/gtsort.1
 -man/man1/gunexpand.1
 -man/man1/guniq.1
 -man/man1/gwc.1
 +man/man1/${GNU_PROGRAM_PREFIX}cat.1
 +man/man1/${GNU_PROGRAM_PREFIX}cksum.1
 +man/man1/${GNU_PROGRAM_PREFIX}comm.1
 +man/man1/${GNU_PROGRAM_PREFIX}csplit.1
 +man/man1/${GNU_PROGRAM_PREFIX}cut.1
 +man/man1/${GNU_PROGRAM_PREFIX}expand.1
 +man/man1/${GNU_PROGRAM_PREFIX}fmt.1
 +man/man1/${GNU_PROGRAM_PREFIX}fold.1
 +man/man1/${GNU_PROGRAM_PREFIX}head.1
 +man/man1/${GNU_PROGRAM_PREFIX}join.1
 +man/man1/${GNU_PROGRAM_PREFIX}md5sum.1
 +man/man1/${GNU_PROGRAM_PREFIX}nl.1
 +man/man1/${GNU_PROGRAM_PREFIX}od.1
 +man/man1/${GNU_PROGRAM_PREFIX}paste.1
 +man/man1/${GNU_PROGRAM_PREFIX}pr.1
 +man/man1/${GNU_PROGRAM_PREFIX}ptx.1
 +man/man1/${GNU_PROGRAM_PREFIX}sort.1
 +man/man1/${GNU_PROGRAM_PREFIX}split.1
 +man/man1/${GNU_PROGRAM_PREFIX}sum.1
 +man/man1/${GNU_PROGRAM_PREFIX}tac.1
 +man/man1/${GNU_PROGRAM_PREFIX}tail.1
 +man/man1/${GNU_PROGRAM_PREFIX}tr.1
 +man/man1/${GNU_PROGRAM_PREFIX}tsort.1
 +man/man1/${GNU_PROGRAM_PREFIX}unexpand.1
 +man/man1/${GNU_PROGRAM_PREFIX}uniq.1
 +man/man1/${GNU_PROGRAM_PREFIX}wc.1
  ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/textutils.mo
  ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/textutils.mo
  ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/textutils.mo
 --- textproc/textutils/Makefile.orig	2002-12-21 19:54:25.000000000 -0800
 +++ textproc/textutils/Makefile	2002-12-21 19:55:37.000000000 -0800
 @@ -12,7 +12,10 @@
  USE_PERL5=	build
  USE_GMAKE=	YES
  GNU_CONFIGURE=	YES
 -CONFIGURE_ARGS=	--program-prefix=g
 +.if defined(GNU_PROGRAM_PREFIX)
 +CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 +.endif
 +PLIST_SUBST+=	GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}

  post-install:
  	${INSTALL_INFO} ${PREFIX}/info/textutils.info ${PREFIX}/info/dir

State-Changed-From-To: open->closed 
State-Changed-By: wiz 
State-Changed-When: Wed Feb 26 06:00:03 PST 2003 
State-Changed-Why:  
I think this one has been fixed now -- thanks! 

From: "Jeremy C. Reed" <reed@reedmedia.net>
To: wiz@netbsd.org
Cc: pkg-manager@netbsd.org, <gnats-bugs@netbsd.org>
Subject: Re: pkg/18886
Date: Fri, 14 Mar 2003 23:27:57 -0800 (PST)

 On 26 Feb 2003 wiz@netbsd.org wrote:

 > Synopsis: diffs for customizable GNU prefix for pkgsrc
 >
 > State-Changed-From-To: open->closed
 > State-Changed-By: wiz
 > State-Changed-When: Wed Feb 26 06:00:03 PST 2003
 > State-Changed-Why:
 > I think this one has been fixed now -- thanks!

 gcpio needs to be fixed too. The patch is below. Note that this gets rid
 of the man page changes (so patch-ab is different).

 (On a releated note, gcpio is old. A newer version is available. Plus I
 have a few other patches for gcpio. But I want to get one thing done at a
 time.)

 Thanks again for the help.

    Jeremy C. Reed

 ? archivers/gcpio/README.html
 Index: archivers/gcpio/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/archivers/gcpio/Makefile,v
 retrieving revision 1.14
 diff -b -u -r1.14 Makefile
 --- archivers/gcpio/Makefile	2002/08/25 21:49:04	1.14
 +++ archivers/gcpio/Makefile	2003/03/15 07:22:51
 @@ -14,6 +14,14 @@
  GNU_CONFIGURE=	yes
  LIBS+=		-lgnumalloc

 +.include "../../mk/bsd.prefs.mk"
 +
 +.if defined(GNU_PROGRAM_PREFIX)
 +CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 +.endif
 +PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 +BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 +
  INFO_FILES=	cpio.info

  .include "../../mk/texinfo.mk"
 Index: archivers/gcpio/PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/archivers/gcpio/PLIST,v
 retrieving revision 1.2
 diff -b -u -r1.2 PLIST
 --- archivers/gcpio/PLIST	2002/02/18 15:14:00	1.2
 +++ archivers/gcpio/PLIST	2003/03/15 07:22:51
 @@ -1,6 +1,6 @@
  @comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:00 seb Exp $
 -bin/gcpio
 +bin/${GNU_PROGRAM_PREFIX}cpio
  @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cpio.info
  info/cpio.info
  @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cpio.info
 -man/man1/gcpio.1.gz
 +man/man1/${GNU_PROGRAM_PREFIX}cpio.1.gz
 Index: archivers/gcpio/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/archivers/gcpio/distinfo,v
 retrieving revision 1.3
 diff -b -u -r1.3 distinfo
 --- archivers/gcpio/distinfo	2001/07/15 11:34:38	1.3
 +++ archivers/gcpio/distinfo	2003/03/15 07:22:51
 @@ -2,6 +2,6 @@

  SHA1 (cpio-2.4.2.tar.gz) = 88e557b2e14ad7b575554473e4ef4624a993b71f
  Size (cpio-2.4.2.tar.gz) = 185281 bytes
 -SHA1 (patch-aa) = 30d3b6c6e9e6eb579f93328325cc89108d6a32d4
 -SHA1 (patch-ab) = 89dbeb8276a94831e9d792915df66bbc3733ca71
 +SHA1 (patch-aa) = cc8a08755e2c2d8007e91ee4006c52c6cb684235
 +SHA1 (patch-ab) = bbbe14be76c2c81ad00588c3436a61fd0a13e778
  SHA1 (patch-ac) = 372b5fe8bb22a609c22089c78f67387e66436372
 Index: archivers/gcpio/patches/patch-aa
 ===================================================================
 RCS file: /cvsroot/pkgsrc/archivers/gcpio/patches/patch-aa,v
 retrieving revision 1.3
 diff -b -u -r1.3 patch-aa
 --- archivers/gcpio/patches/patch-aa	2001/07/15 11:34:38	1.3
 +++ archivers/gcpio/patches/patch-aa	2003/03/15 07:22:51
 @@ -1,16 +1,14 @@
 -$NetBSD: patch-aa,v 1.3 2001/07/15 11:34:38 jlam Exp $
 -
 ---- Makefile.in.orig	Wed Dec 20 11:28:30 1995
 -+++ Makefile.in
 +--- Makefile.in.orig	Wed Dec 20 08:28:30 1995
 ++++ Makefile.in	Sat Dec 28 14:25:53 2002
  @@ -66,9 +66,9 @@
   exec_prefix = @exec_prefix@

   # Prefix for each installed program, normally empty or `g'.
  -binprefix =
 -+binprefix = g
 ++binprefix = @program_prefix@
   # Prefix for each installed man page, normally empty or `g'.
  -manprefix =
 -+manprefix = g
 ++manprefix = @program_prefix@


   # Where to install the cpio and mt executables.
 Index: archivers/gcpio/patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/archivers/gcpio/patches/patch-ab,v
 retrieving revision 1.2
 diff -b -u -r1.2 patch-ab
 --- archivers/gcpio/patches/patch-ab	1998/08/07 10:35:48	1.2
 +++ archivers/gcpio/patches/patch-ab	2003/03/15 07:22:52
 @@ -1,126 +1,10 @@
 -$NetBSD: patch-ab,v 1.2 1998/08/07 10:35:48 agc Exp $
 -
 ---- cpio.1.orig	Wed Nov 30 19:23:38 1994
 -+++ cpio.1	Tue Mar  3 14:11:31 1998
 -@@ -1,8 +1,8 @@
 - .TH CPIO 1L \" -*- nroff -*-
 - .SH NAME
 --cpio \- copy files to and from archives
 -+gcpio \- GNU cpio, copy files to and from archives
 - .SH SYNOPSIS
 --.B cpio
 -+.B gcpio
 - {\-o|\-\-create} [\-0acvABLV] [\-C bytes] [\-H format] [\-M message]
 - [\-O [[user@]host:]archive] [\-F [[user@]host:]archive]
 - [\-\-file=[[user@]host:]archive] [\-\-format=format] [\-\-message=message]
 -@@ -10,7 +10,7 @@
 - [\-\-block-size=blocks] [\-\-dereference] [\-\-io-size=bytes] [\-\-quiet]
 - [\-\-force\-local] [\-\-help] [\-\-version] < name-list [> archive]
 -
 --.B cpio
 -+.B gcpio
 - {\-i|\-\-extract} [\-bcdfmnrtsuvBSV] [\-C bytes] [\-E file] [\-H format]
 - [\-M message] [\-R [user][:.][group]] [\-I [[user@]host:]archive]
 - [\-F [[user@]host:]archive] [\-\-file=[[user@]host:]archive]
 -@@ -22,7 +22,7 @@
 - [\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse] [\-\-only\-verify\-crc]
 - [\-\-quiet] [\-\-help] [\-\-version] [pattern...] [< archive]
 -
 --.B cpio
 -+.B gcpio
 - {\-p|\-\-pass-through} [\-0adlmuvLV] [\-R [user][:.][group]]
 - [\-\-null] [\-\-reset-access-time] [\-\-make-directories] [\-\-link] [\-\-quiet]
 - [\-\-preserve-modification-time] [\-\-unconditional] [\-\-verbose] [\-\-dot]
 -@@ -32,16 +32,16 @@
 - This manual page
 - documents the GNU version of
 - .BR cpio .
 --.B cpio
 -+.B gcpio
 - copies files into or out of a cpio or tar archive, which is a file that
 - contains other files plus information about them, such as their
 - file name, owner, timestamps, and access permissions.  The archive can
 - be another file on the disk, a magnetic tape, or a pipe.
 --.B cpio
 -+.B gcpio
 - has three operating modes.
 - .PP
 - In copy-out mode,
 --.B cpio
 -+.B gcpio
 - copies files into an archive.  It reads a list of filenames, one per
 - line, on the standard input, and writes the archive onto the standard
 - output.  A typical way to generate the list of filenames is with the
 -@@ -52,7 +52,7 @@
 - directories that are unwritable or not searchable.
 - .PP
 - In copy-in mode,
 --.B cpio
 -+.B gcpio
 - copies files out of an archive or lists the archive contents.  It
 - reads the archive from the standard input.  Any non-option command
 - line arguments are shell globbing patterns; only files in the archive
 -@@ -63,14 +63,14 @@
 - extracted.
 - .PP
 - In copy-pass mode,
 --.B cpio
 -+.B gcpio
 - copies files from one directory tree to another, combining the
 - copy-out and copy-in steps without actually using an archive.
 - It reads the list of files to copy from the standard input; the
 - directory into which it will copy them is given as a non-option
 - argument.
 - .PP
 --.B cpio
 -+.B gcpio
 - supports the following archive formats: binary, old ASCII, new
 - ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar.
 - The binary format
 -@@ -86,7 +86,7 @@
 - The crc format is
 - like the new ASCII format, but also contains a checksum for each file
 - which
 --.B cpio
 -+.B gcpio
 - calculates when creating an archive
 - and verifies when the file is extracted from the archive.
 - The HPUX formats are provided for compatibility with HPUX's cpio which
 -@@ -102,18 +102,18 @@
 - than 255 characters (less unless they have a "/" in just the right place).
 - .PP
 - By default,
 --.B cpio
 -+.B gcpio
 - creates binary format archives, for compatibility with
 - older
 - .B cpio
 - programs.
 - When extracting from archives,
 --.B cpio
 -+.B gcpio
 - automatically recognizes which kind of archive it is reading and can
 - read archives created on machines with a different byte-order.
 - .PP
 - Some of the options to
 --.B cpio
 -+.B gcpio
 - apply only to certain operating modes; see the SYNOPSIS section for a
 - list of which options are allowed in which modes.
 - .SS OPTIONS
 -@@ -164,7 +164,7 @@
 - In copy-in mode, read additional patterns specifying filenames to
 - extract or list from FILE.  The lines of FILE are treated as if they
 - had been non-option arguments to
 --.BR cpio .
 -+.BR gcpio .
 - .TP
 - .I "\-f, \-\-nonmatching"
 - Only copy files that do not match any of the given patterns.
 -@@ -322,5 +322,5 @@
 - .TP
 - .I "\-\-version"
 - Print the
 --.B cpio
 -+.B gcpio
 - program version number and exit.
 +--- configure.orig	Thu Dec 26 15:00:22 2002
 ++++ configure	Thu Dec 26 15:01:33 2002
 +@@ -2117,6 +2117,7 @@
 + s%@LIBS@%$LIBS%g
 + s%@exec_prefix@%$exec_prefix%g
 + s%@prefix@%$prefix%g
 ++s%@program_prefix@%$program_prefix%g
 + s%@program_transform_name@%$program_transform_name%g
 + s%@bindir@%$bindir%g
 + s%@sbindir@%$sbindir%g

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.