pkg/28236: recent changes to x11/openmotif were not properly tested and are incomplete

["Greg A. Woods" <woods%weird.com@localhost>]

>Number:         28236
>Category:       pkg
>Synopsis:       recent changes to x11/openmotif were not properly tested and 
>are incomplete
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 11 23:25:00 +0000 2004
>Originator:     Greg A. Woods
>Release:        NetBSD
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD
>Description:

        the recent change to x11/openmotif to have it not install files
        in X11BASE is incomplete and must not have been tested properly.

        the resulting build cannot access its own default system.mwmrc
        (nor its own bitmap files)

        BTW, is it really necessary for this package to use its own
        private imake and its own private config/cf files (that need
        separate patching to duplicate changes that will already have
        been made to port X11 to the target system)?

>How-To-Repeat:

        try running mwm and note that it has no root window menu any more

>Fix:

Index: x11/openmotif/patches/patch-aq
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/x11/openmotif/patches/patch-aq,v
retrieving revision 1.1
diff -u -r1.1 patch-aq
--- x11/openmotif/patches/patch-aq      1 Dec 2001 02:00:43 -0000       1.1
+++ x11/openmotif/patches/patch-aq      11 Nov 2004 22:44:30 -0000
@@ -2,10 +2,21 @@
 
 --- clients/uil/Imakefile.orig Thu Nov 29 09:34:10 2001
 +++ clients/uil/Imakefile      Thu Nov 29 22:17:48 2001
-@@ -74,5 +74,5 @@
+@@ -73,7 +73,7 @@
+               UilSymNam.o     UilSymStor.o    UilData.o \
                UilLstMac.o     UilSemVal.o     UilSemCSet.o    UilDB.o
  
 -#if DoSharedLib && DoNormalLib
 +#if DoSharedLib && DoNormalLib && SeparateSharedCompile
  NORMAL_OBJ =  unshared/UilCmd.o       unshared/UilDiags.o \
        unshared/UilKeyTab.o    unshared/UilLexAna.o    unshared/UilLexPars.o \
+       unshared/UilLstLst.o    unshared/UilP2Out.o     unshared/UilP2Reslv.o \
+@@ -103,7 +103,7 @@
+ 
+ MComplexProgramTarget_2(uil,$(LOCAL_LIBRARIES),NullParameter)
+ 
+-SpecialLibObjectRule(UilDB.o,NullParameter,-DLIBDIR='"'$(XPROJECTROOT)/lib/X11'"'
 -DINCDIR='"'$(XPROJECTROOT)/include/X11'"')
++SpecialLibObjectRule(UilDB.o,NullParameter,-DLIBDIR='"'$(PROJECTROOT)/lib/X11'"'
 -DINCDIR='"'$(PROJECTROOT)/include/X11'"')
+ 
+ LinkFile(UilParser.c,UilMain.c)
+ SpecialLibObjectRule(UilParser.o,NullParameter,-DCALLABLE)
Index: x11/openmotif/patches/patch-ac
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/x11/openmotif/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- x11/openmotif/patches/patch-ac      8 Sep 2001 20:03:44 -0000       1.2
+++ x11/openmotif/patches/patch-ac      11 Nov 2004 22:40:46 -0000
@@ -2,6 +2,17 @@
 
 --- clients/mwm/Imakefile.orig Fri Sep  7 22:06:54 2001
 +++ clients/mwm/Imakefile
+@@ -176,8 +176,8 @@
+ NormalLibraryObjectRule()
+ MComplexProgramTarget_1(mwm,$(LOCAL_LIBRARIES),$(SYSTEM_LIBRARIES))
+ 
+-SpecialObjectRule(WmResParse.o,NullParameter,-DLIBDIR='"'$(XPROJECTROOT)/lib/X11'"')
+-SpecialObjectRule(WmResource.o,NullParameter,-DBITMAPDIR='"'$(XPROJECTROOT)/include/X11/bitmaps/'"')
++SpecialObjectRule(WmResParse.o,NullParameter,-DLIBDIR='"'$(PROJECTROOT)/lib/X11'"')
++SpecialObjectRule(WmResource.o,NullParameter,-DBITMAPDIR='"'$(PROJECTROOT)/include/X11/bitmaps/'"')
+ 
+ /* This is added for 8.07 optimizer bug -see Keith Taylor.
+ */
 @@ -217,7 +217,7 @@
  CppFileTarget(sys.mwmrc,sys.mwmrc.src,$(LOCAL_CPP_DEFINES),)
  */