Greg Steuck <[email protected]> writes:

> I am running with my cabal.port.mk[1] patches which include this
> SUBST_VARS +=         DISTNAME MODCABAL_STEM MODCABAL_VERSION PKGNAME
>
> I try to regenerate x11/xmonad/pkg/PLIST[2] with `make update-plist` and
> the result comes out with ${MODCABAL_STEM}-${MODCABAL_VERSION} contrary
> to my expectation of it using ${DISTNAME}.
>
> The relevant variables seem to suggest my expectation is in line with
> update-plist(1):
>
>>     Most SUBST_VARS variables will be back-substituted into the regenerated
>>     packing-lists, starting from the longest variable values.  

I removed make from the picture. I have a terrible script which I re-run
after make fake is done and try to see what kind of PLIST gets built de
novo.

Looks like update-plist when faced with multiple variables set to the
same value silently ignores them (to avoid breaking ties?). So, if I
have
  -DDISTNAME=xmonad-0.15\
  -DPKGNAME=xmonad-0.15\
they won't get substituted. If I remove either one of them, the other
one is used.

Thanks
Greg
#!/bin/ksh

set -x

PKGPATH=x11/xmonad; export PKGPATH
PORTSDIR=/usr/ports  FAKE_TREE_OWNER=_pbuild  PORTS_TREE_OWNER=$(id -un) \
doas /usr/bin/perl /usr/ports/infrastructure/bin/update-plist \
  -D FAKE_COOKIE=/usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_done \
  -D PKGLOCATE_COOKIE=/usr/ports/pobj/xmonad-0.15/fake-amd64/.pkglocate_cookie \
  -w .orig -w .bak.orig -w .beforesubst  \
  -i ARCH -i BASE_PKGPATH -i FULLPKGNAME -i PKGSTEM -i FULLPKGPATH  -i 
LOCALSTATEDIR -i MACHINE_ARCH \
  -s BASE_PKGPATH -s LOCALBASE -s LOCALSTATEDIR -s PREFIX  -s RCDIR -s 
SYSCONFDIR -s X11BASE \
  -X /usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_done -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/.install_started -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/.pkglocate_cookie  -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/.saved_libs -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/etc/\{firmware,rc.d\} -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/bin -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/include/X11 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/info -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/lib/pkgconfig -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/lib/X11/app-defaults -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/libdata/perl5/site_perl -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/libexec -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/\{cat1,cat2,cat3,cat3f,cat3p,cat4,cat5,cat6,cat7,cat8,cat9,catl,catn\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/\{man1,man2,man3,man3f,man3p,man4,man5,man6,man7,man8,man9,manl,mann\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/ja_JP.EUC/\{cat1,cat2,cat3,cat3f,cat3p,cat4,cat5,cat6,cat7,cat8,cat9,catl,catn\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/man/ja_JP.EUC/\{man1,man2,man3,man3f,man3p,man4,man5,man6,man7,man8,man9,manl,mann\}
 -X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/sbin -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/\{dict,examples,misc,pkgconfig,skel\}
 -X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/doc/pkg-readmes -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{C,da_DK.ISO_8859-1,de_AT.ISO_8859-1,de_CH.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{de_DE.ISO_8859-1,el_GR.ISO_8859-7,en_AU.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{en_CA.ISO_8859-1,en_GB.ISO_8859-1,en_US.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{es_ES.ISO_8859-1,et_EE.ISO-8859-1,fi_FI.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{fr_BE.ISO_8859-1,fr_CA.ISO_8859-1,fr_CH.ISO_8859-1\}
 -X /usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/fr_FR.ISO_8859-1 
-X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{hr_HR.ISO_8859-2,is_IS.ISO_8859-1,it_CH.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{it_IT.ISO_8859-1,ja_JP.EUC,ko_KR.EUC,lt_LN.ASCII\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{lt_LN.ISO_8859-1,lt_LN.ISO_8859-2,nl_BE.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{no_NO.ISO_8859-1,pl_PL.ISO_8859-2,pt_PT.ISO_8859-1\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{ru_RU.CP866,ru_RU.ISO_8859-5,ru_RU.KOI8-R\}
 -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/usr/local/share/nls/\{sv_SE.ISO_8859-1,uk_UA.KOI8-U\}
 -X /usr/ports/pobj/xmonad-0.15/fake-amd64/var/\{db,games,log,spool,www\} -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg/Makefile -X 
/usr/ports/pobj/xmonad-0.15/fake-amd64/debug-pkg/Makefile.new \
  -L /usr/ports/pobj/xmonad-0.15/fake-amd64/.fake_log  \
  -P /home/greg/ports/x11/xmonad/pkg  \
  -- \
  `SUBPACKAGE=- make run-depends-args lib-depends-args` \
  -u /usr/ports/infrastructure/db/user.list\
  -DWRKOBJDIR=/usr/ports/pobj\
  -DHISTORY_DIR=/usr/ports/plist/amd64/history\
  -Dno_mips64=1\
  -v \
  -DFLAVORS= -B /usr/ports/pobj/xmonad-0.15/fake-amd64 -V 1 -V 5\
  -DDISTNAME=xmonad-0.15\
  -DPKGNAME=xmonad-0.15\
  -DMODCABAL_VERSION=0.15\
  -DMODCABAL_STEM=xmonad\
  -DARCH=amd64\
  -DBASE_PKGPATH=x11/xmonad\
  -DFLAVOR_EXT=\
  -DFULLPKGNAME=xmonad-0.15p0\
  -DHOMEPAGE=http://www.xmonad.org/\
  -DLOCALBASE=/usr/local\
  -DLOCALSTATEDIR=/var\
  -DMACHINE_ARCH=amd64\
  -DMAINTAINER=The\ OpenBSD\ ports\ mailing-list\ \<[email protected]\>\
  -DPREFIX=/usr/local\
  -DRCDIR=/etc/rc.d\
  -DSYSCONFDIR=/etc\
  -DX11BASE=/usr/X11R6\
  -DPKGSTEM=xmonad\
  -DPERMIT_PACKAGE_FTP=Yes\
  -DPERMIT_PACKAGE=Yes -p /usr/local -A'amd64'\
  -DCOMMENT=tiling\ window\ manager \
  -d /home/greg/ports/x11/xmonad/pkg/DESCR \
  -f /home/greg/ports/x11/xmonad/pkg/PLIST \
  -DFULLPKGPATH=x11/xmonad \
  -M /home/greg/ports/x11/xmonad/pkg/MESSAGE xmonad-0.15p0

Reply via email to