head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.176 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.174 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.172 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.170 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.168 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.166 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.164 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.162 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.160 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.158 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.156 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.154 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.152 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.150 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.148 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.146 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.144 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.142 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.140 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.138 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.136 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.134 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.132 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.128 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.108 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.130 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.126 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.124 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.122 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.120 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.118 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.116 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.114 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.112 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.110 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.106 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.104 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.102 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.100 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.98 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.96 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.94 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.92 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.90 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.88 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.86 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.84 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.82 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.80 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.78 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.76 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.74 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.72 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.70 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.68 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.66 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.64 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.62 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.60 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.58 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.56 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.54 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.52 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.50 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.48 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.44 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.42 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.40 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.38 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.36 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.34 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.32 pkgsrc-2008Q2-base:1.2 cwrapper-base:1.2 cwrapper:1.2.0.30 pkgsrc-2008Q1:1.2.0.28 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.26 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.24 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.22 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.20 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.18 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.16 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.14 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.12 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.10 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.8 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.6 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.2 date 2004.11.05.16.44.46; author agc; state Exp; branches; next 1.1; 1.1 date 2002.12.08.12.54.46; author cjep; state Exp; branches; next ; desc @@ 1.2 log @Bring this package into line with 21st century pkgsrc: + ZOULARISBASE is gone - just use PREFIX to find bmake + WRKDIR contains the name of the work directory, so find this out from pkgsrc + remove getcwd() calls, and use WRKDIR to find the place where the various informational files are placed + retain the ability to set the working directory from the command-line, but it is almost useless these days Bump pkg revision to 2. @ text @$NetBSD: patch-ac,v 1.1 2002/12/08 12:54:46 cjep Exp $ --- gensolpkg.c.in.orig Sat May 5 15:44:31 2001 +++ gensolpkg.c.in Fri Nov 5 16:19:24 2004 @@@@ -79,7 +79,7 @@@@ static char comment[256 + 1]; /* one line descr of pkg */ static char prefix[MAXPATHLEN]; /* current prefix */ -static char *workdir; /* name of working directory */ +static char workdir[MAXPATHLEN]; /* name of working directory */ static char *category; /* category of package - default "application" */ static int transform; /* transform the package - default "disabled" */ @@@@ -357,9 +357,9 @@@@ } (void) fprintf(fp, "!PKG=%s\n", pkg); (void) fprintf(fp, "!PREFIX=%s\n", prefix); - (void) fprintf(fp, "i pkginfo=%s/%s\n", getcwd(buf, sizeof(buf)), pkginfofile); - (void) fprintf(fp, "i version=%s/%s\n", getcwd(buf, sizeof(buf)), versionfile); - (void) fprintf(fp, "i depend=%s/%s\n", getcwd(buf, sizeof(buf)), dependfile); + (void) fprintf(fp, "i pkginfo=%s\n", pkginfofile); + (void) fprintf(fp, "i version=%s\n", versionfile); + (void) fprintf(fp, "i depend=%s\n", dependfile); for (linec = 1 ; fgets(buf, sizeof(buf), plist) != (char *) NULL ; linec++) { /* trim leading whitespace from PLIST entries */ for (cp = buf ; isspace(*cp) ; cp++) { @@@@ -463,7 +463,7 @@@@ (void) fputc('\n', fp2); } (void) fclose(fp2); - (void) fprintf(fp, "i postinstall=%s/%s/.postinstall\n", getcwd(buf, sizeof(buf)), workdir); + (void) fprintf(fp, "i postinstall=%s/.postinstall\n", workdir); } if (remove.s_c > 0) { (void) snprintf(f, sizeof(f), "%s/.postremove", workdir); @@@@ -493,7 +493,7 @@@@ (void) fputc('\n', fp2); } (void) fclose(fp2); - (void) fprintf(fp, "i postremove=%s/%s/.postremove\n", getcwd(buf, sizeof(buf)), workdir); + (void) fprintf(fp, "i postremove=%s/.postremove\n", workdir); } (void) fclose(fp); (void) fclose(plist); @@@@ -572,13 +572,17 @@@@ int i; (void) strcpy(prefix, "@@PREFIX@@"); - (void) strcpy(bmake, "@@PREFIX@@/bsd/bin/bmake"); + (void) strcpy(bmake, "@@PREFIX@@/bin/bmake"); (void) strcpy(output, "/tmp"); (void) strcpy(pkgdir, "@@SPOOLDIR@@"); transform = 0; - workdir = "work"; category = "application"; pkg = (char *) NULL; + (void) snprintf(cmd, sizeof(cmd), "%s show-var VARNAME=WRKDIR", bmake); + if (!pipeit(workdir, sizeof(workdir), cmd, "r")) { + (void) fprintf(stderr, "Warning: can't find package workdir\n"); + exit(1); + } (void) snprintf(cmd, sizeof(cmd), "%s show-var VARNAME=PREFIX", bmake); if (!pipeit(prefix, sizeof(prefix), cmd, "r")) { (void) fprintf(stderr, "Can't find package prefix\n"); @@@@ -633,7 +637,7 @@@@ transform = 1; break; case 'w': - workdir = optarg; + (void) strnncpy(workdir, sizeof(workdir), optarg, strlen(optarg)); break; default: fprintf(stderr, "Usage:\n"); @ 1.1 log @Fix typo in manual page. @ text @d1 1 a1 1 $NetBSD$ d3 43 a45 3 --- gensolpkg.c.in.orig Sat May 5 14:44:31 2001 +++ gensolpkg.c.in @@@@ -572,7 +572,7 @@@@ main(int argc, char **argv) d50 1 a50 1 + (void) strcpy(bmake, "@@ZOULARISBASE@@/bin/bmake"); d54 20 @