Hi,

after a run of pkg_check(8), i noticed that print/lout creates some
files not mentioned in the plist, so I tried to clean it up a little
bit by running lout -x at fake time instead of using the @exec line
in pkg/PLLIST-main (the files created by that lout -x llne don't
contain any paths, and there's indeed no binary diff in the created
files). See diff below.

However, the two @unexec lines in the old pkg/PLIST-main don't get
fired during update (because they come too early). Trying to update
to the new package fails:

Collision in lout-3.39p0->lout-3.39p1: the following files already exist
        /usr/local/lib/lout/data/fontdefs.li (same checksum)
        /usr/local/lib/lout/data/latin2.li (same checksum)
        /usr/local/lib/lout/data/loutrefs.li (same checksum)
        /usr/local/lib/lout/data/oldrefs.li (same checksum)
        /usr/local/lib/lout/data/refstyle.li (same checksum)
        /usr/local/lib/lout/data/standard.li (same checksum)
        /usr/local/lib/lout/hyph/croatian.lp (same checksum)
        /usr/local/lib/lout/hyph/czech.lp (same checksum)
        /usr/local/lib/lout/hyph/danish.lp (same checksum)
        /usr/local/lib/lout/hyph/dutch.lp (same checksum)
        /usr/local/lib/lout/hyph/english.lp (same checksum)
        /usr/local/lib/lout/hyph/engluk.lp (same checksum)
        /usr/local/lib/lout/hyph/esperanto.lp (same checksum)
        /usr/local/lib/lout/hyph/finnish.lp (same checksum)
        /usr/local/lib/lout/hyph/french.lp (same checksum)
        /usr/local/lib/lout/hyph/german.lp (same checksum)
        /usr/local/lib/lout/hyph/italian.lp (same checksum)
        /usr/local/lib/lout/hyph/magyar.lp (same checksum)
        /usr/local/lib/lout/hyph/norweg.lp (same checksum)
        /usr/local/lib/lout/hyph/polish.lp (same checksum)
        /usr/local/lib/lout/hyph/portugal.lp (same checksum)
        /usr/local/lib/lout/hyph/programming.lp (same checksum)
        /usr/local/lib/lout/hyph/russian.lp (same checksum)
        /usr/local/lib/lout/hyph/slovak.lp (same checksum)
        /usr/local/lib/lout/hyph/slovenia.lp (same checksum)
        /usr/local/lib/lout/hyph/spanish.lp (same checksum)
        /usr/local/lib/lout/hyph/swedish.lp (same checksum)
        /usr/local/lib/lout/hyph/uppersorbian.lp (same checksum)

I guess this will need a special quirk to remove those files before
the actual update happens. We've something like this for texlive,
but my perl-foo is low, so I need some help.

Ciao,
        Kili


Index: Makefile
===================================================================
RCS file: /cvs/ports/print/lout/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    11 May 2011 07:45:53 -0000      1.9
+++ Makefile    6 Sep 2011 20:09:11 -0000
@@ -8,7 +8,7 @@ PKGNAME-main=   ${DISTNAME}
 PKGNAME-doc=    ${DISTNAME:S/-/-doc-/}
 CATEGORIES=    print
 
-REVISION-main= 0
+REVISION-main= 1
 
 HOMEPAGE=      http://savannah.nongnu.org/projects/lout/
 MASTER_SITES=   ${MASTER_SITE_SAVANNAH:=lout/}
@@ -31,5 +31,9 @@ MULTI_PACKAGES=       -doc -main
 
 PKG_ARCH-doc=  *
 WANTLIB-doc=
+
+post-install:
+       env LOUTLIB=${PREFIX}/lib/lout \
+               ${PREFIX}/bin/lout -x -s ${PREFIX}/lib/lout/include/init
 
 .include <bsd.port.mk>
Index: pkg/PLIST-doc
===================================================================
RCS file: /cvs/ports/print/lout/pkg/PLIST-doc,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-doc
--- pkg/PLIST-doc       23 Apr 2011 21:49:27 -0000      1.3
+++ pkg/PLIST-doc       6 Sep 2011 20:09:11 -0000
@@ -124,6 +124,7 @@ share/doc/lout/slides/outfile.ps
 share/doc/lout/user/
 @comment share/doc/lout/user/.pie_intr.swp
 share/doc/lout/user/README
+@comment share/doc/lout/user/README.orig
 share/doc/lout/user/all
 share/doc/lout/user/ap_byp
 share/doc/lout/user/ap_col
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/lout/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main      11 May 2011 07:45:53 -0000      1.3
+++ pkg/PLIST-main      6 Sep 2011 20:09:11 -0000
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2011/05/11 07:45:53 ajacoutot Exp $
 @pkgpath print/lout
-@unexec rm -rf %D/lib/lout/data/*.li
-@unexec rm -rf %D/lib/lout/hyph/*.lp
 @bin bin/lout
 @bin bin/prg2lout
 lib/lout/
@@ -10,11 +8,17 @@ lib/lout/data/README
 lib/lout/data/fcvt
 lib/lout/data/fcvt.awk
 lib/lout/data/fontdefs.ld
+lib/lout/data/fontdefs.li
 lib/lout/data/latin2.ld
+lib/lout/data/latin2.li
 lib/lout/data/loutrefs.ld
+lib/lout/data/loutrefs.li
 lib/lout/data/oldrefs.ld
+lib/lout/data/oldrefs.li
 lib/lout/data/refstyle.ld
+lib/lout/data/refstyle.li
 lib/lout/data/standard.ld
+lib/lout/data/standard.li
 lib/lout/font/
 lib/lout/font/00README
 lib/lout/font/AG-Bd
@@ -180,27 +184,49 @@ lib/lout/font/ZD
 lib/lout/hyph/
 lib/lout/hyph/README
 lib/lout/hyph/croatian.lh
+lib/lout/hyph/croatian.lp
 lib/lout/hyph/czech.lh
+lib/lout/hyph/czech.lp
 lib/lout/hyph/danish.lh
+lib/lout/hyph/danish.lp
 lib/lout/hyph/dutch.lh
+lib/lout/hyph/dutch.lp
 lib/lout/hyph/english.lh
+lib/lout/hyph/english.lp
 lib/lout/hyph/engluk.lh
+lib/lout/hyph/engluk.lp
 lib/lout/hyph/esperanto.lh
+lib/lout/hyph/esperanto.lp
 lib/lout/hyph/finnish.lh
+lib/lout/hyph/finnish.lp
 lib/lout/hyph/french.lh
+lib/lout/hyph/french.lp
 lib/lout/hyph/german.lh
+lib/lout/hyph/german.lp
 lib/lout/hyph/italian.lh
+lib/lout/hyph/italian.lp
 lib/lout/hyph/magyar.lh
+lib/lout/hyph/magyar.lp
 lib/lout/hyph/norweg.lh
+lib/lout/hyph/norweg.lp
 lib/lout/hyph/polish.lh
+lib/lout/hyph/polish.lp
 lib/lout/hyph/portugal.lh
+lib/lout/hyph/portugal.lp
 lib/lout/hyph/programming.lh
+lib/lout/hyph/programming.lp
 lib/lout/hyph/russian.lh
+lib/lout/hyph/russian.lp
 lib/lout/hyph/slovak.lh
+lib/lout/hyph/slovak.lp
 lib/lout/hyph/slovenia.lh
+lib/lout/hyph/slovenia.lp
 lib/lout/hyph/spanish.lh
+lib/lout/hyph/spanish.lp
 lib/lout/hyph/swedish.lh
+lib/lout/hyph/swedish.lp
 lib/lout/hyph/uppersorbian.lh
+lib/lout/hyph/uppersorbian.lp
 lib/lout/include/
 lib/lout/include/README
 lib/lout/include/blue
@@ -291,4 +317,3 @@ lib/lout/maps/koi8r.LCM
 lib/lout/maps/null.LCM
 @man man/man1/lout.1
 @man man/man1/prg2lout.1
-@exec %D/bin/lout -x -s %D/lib/lout/include/init

Reply via email to