I noticed that pkglocatedb,src would sometimes fail to build due to a
missing /usr/X11R6/lib/X11/config/Motif.rules.  Odd.

That file is installed by xenocara.  The openmotif package comes
with its own version of Motif.rules and Motif.tmpl and by way of
@sample offers to install them in the place of the xenocara ones
if those don't exist.  Yeah, that doesn't make sense.  Now, if you
run "pkg_delete -c openmotif", all @sample'd files will be
unconditionally removed including the xenocara ones!  And if you
reinstall the package, its files take the place of the previously
deleted xenocara ones!

Fix: Drop the @sample lines.  Having two versions of Motif.rules
in different places isn't great, but having an indeterminate version
(xenocara, openmotif, none) in /usr/X11R6/lib/X11/config is worse.


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile    16 Sep 2011 12:29:16 -0000      1.51
+++ Makefile    4 Aug 2012 21:35:57 -0000
@@ -8,7 +8,7 @@ DISTNAME=               openmotif-${VERSION}
 PKGNAME-main=          openmotif-${VERSION}
 PKGNAME-demos=         openmotif-demos-${VERSION}
 
-REVISION-main=         3
+REVISION-main=         4
 REVISION-demos=        2
 
 SHARED_LIBS=           Mrm     4.1     \
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/openmotif/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main      7 Nov 2010 19:52:00 -0000       1.4
+++ pkg/PLIST-main      4 Aug 2012 21:35:58 -0000
@@ -282,9 +282,7 @@ lib/X11/bindings/tek
 lib/X11/bindings/xmbind.alias
 lib/X11/config/
 lib/X11/config/Motif.rules
-@sample /usr/X11R6/lib/X11/config/Motif.rules
 lib/X11/config/Motif.tmpl
-@sample /usr/X11R6/lib/X11/config/Motif.tmpl
 lib/X11/system.mwmrc
 lib/libMrm.a
 lib/libMrm.la
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to