diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 0d93c975a05..7e4757c08f6 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,78 +1,43 @@ -# $OpenBSD: Makefile,v 1.28 2006/11/23 23:30:06 kili Exp $ +# $OpenBSD: Makefile,v 1.29 2007/07/18 21:41:05 mbalmer Exp $ -COMMENT-main= "Motif toolkit" -COMMENT-debuglibs="Motif toolkit debug libraries" -COMMENT-demos= "Motif toolkit demos" -VERSION= 2.1.30 -DISTNAME= motif -PATCHLEVEL= 5 -PKGNAME-main= openmotif-${VERSION}.${PATCHLEVEL}p2 -PKGNAME-demos= openmotif-demos-${VERSION}.${PATCHLEVEL}p0 -PKGNAME-debuglibs=openmotif-debuglibs-${VERSION}.${PATCHLEVEL}p0 +COMMENT-main= Motif toolkit +COMMENT-demos= Motif toolkit demos -SHARED_LIBS= Mrm 3.0 \ - Uil 3.0 \ - Xm 3.0 +VERSION= 2.3.0 +DISTNAME= openmotif-${VERSION} +PKGNAME-main= openmotif-${VERSION} +PKGNAME-demos= openmotif-demos-${VERSION} -CATEGORIES= x11 +SHARED_LIBS= Mrm 4.0 \ + Uil 4.0 \ + Xm 4.0 -MASTER_SITES= ftp://ftp.opengroup.org/pub/openmotif/R${VERSION}/tars/ \ - ftp://openmotif.opengroup.org/pub/openmotif/R${VERSION}/tars/ \ - ftp://ftp.kddlabs.co.jp/X11/openmotif/R${VERSION}/tars/ -MASTER_SITES0= ftp://ftp.opengroup.org/pub/openmotif/R${VERSION}/fixes/ \ - ftp://openmotif.opengroup.org/pub/openmotif/R${VERSION}/fixes/ \ - ftp://ftp.kddlabs.co.jp/X11/openmotif/R${VERSION}/fixes/ -MASTER_SITES1= http://www.opengroup.org/openmotif/license/ -DISTFILES= openmotif${VERSION}.tar.gz index.html:1 -DIST_SUBDIR= openmotif -EXTRACT_ONLY= openmotif${VERSION}.tar.gz +CATEGORIES= x11 +MASTER_SITES= http://ftp.ics.com/openmotif/2.3/${VERSION}/ +DIST_SUBDIR= openmotif -PATCHFILES= patch1:0 patch2:0 patch3:0 patch4:0 patch5:0 -PATCH_DIST_STRIP= -p1 +MAINTAINER= Marc Balmer -HOMEPAGE= http://www.opengroup.org/openmotif/ +HOMEPAGE= http://www.opengroup.org/openmotif/ -# license only available on webpage -# http://www.opengroup.org/openmotif/license PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_FTP= Yes -MULTI_PACKAGES= -demos -debuglibs -main +MULTI_PACKAGES= -demos -main -USE_X11= Yes +USE_X11= Yes +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --enable-themes \ + --enable-xft -ALL_TARGET= World -INSTALL_TARGET= install install.man +USE_LIBTOOL= Yes -MAKE_FLAGS= SOMRMREV=${LIBMrm_VERSION} \ - SOUILREV=${LIBUil_VERSION} \ - SOXMREV=${LIBXm_VERSION} -FAKE_FLAGS= ${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST} - -# This dialog has been copied from the lesstif port. -.if defined(HAVE_MOTIF) && ${HAVE_MOTIF:L} == "yes" -IS_INTERACTIVE= Yes - -pre-extract: - @echo "***********************************************************" - @echo "* W a r n i n g *" - @echo "* This port will overwrite your Motif installation. *" - @echo "***********************************************************" - @echo -n "Is this ok? (y/n) ==> " - @(read ans; \ - case x"$$ans" in \ - xy*|xY*) \ - return 0; \ - ;; \ - *) \ - echo "Okay, I won't install it then...."; \ - echo "(Don't worry about the following \"*** Error code 1's)"; \ - return 1; \ - ;; \ - esac) -.endif +MAKE_FLAGS= SOMRMREV=${LIBMrm_VERSION} \ + SOUILREV=${LIBUil_VERSION} \ + SOXMREV=${LIBXm_VERSION} +FAKE_FLAGS= ${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST} pre-configure: # fix sections @@ -81,8 +46,6 @@ pre-configure: # mwmrc is not a kernel interface!! @cd ${WRKSRC}/doc/man/man4 && perl -pi -e "s|special file|5|" *.4 @cd ${WRKSRC}/doc/man/man5 && perl -pi -e "s|file formats|5|" *.5 -# Import from our current X installation. - @cp -f `ls ${X11BASE}/lib/X11/config/* | egrep -v '(Motif|bsdLib.tmpl|cde|\/site.def|host.def)'` ${WRKDIR}/motif/config/cf @mkdir -p ${WRKSRC}/imports/x11 @cd ${WRKSRC}/imports/x11 && for i in bin include lib ; do \ if [ -f $$i ] ; then rm $$i; fi; \ @@ -90,21 +53,27 @@ pre-configure: done # respect PREFIX @cd ${WRKSRC}/config/cf && \ - perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" host.def Motif.tmpl config.cf + perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" host.def Motif.tmpl \ + config.cf -DOCS=BUGREPORT CLOSEDBUGS COPYRIGHT.MOTIF OPENBUGS README RELEASE RELNOTES +DOCS=BUGREPORT COPYRIGHT.MOTIF LICENSE README RELEASE RELNOTES TODO DOCDIR=${PREFIX}/share/doc/openmotif post-install: @${INSTALL_DATA_DIR} ${DOCDIR} - @${INSTALL_DATA} ${FULLDISTDIR}/index.html ${DOCDIR}/LICENSE.html @for i in ${DOCS}; do ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; done @${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${DOCDIR} + @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config + @${INSTALL_DATA} ${WRKSRC}/config/cf/Motif.rules \ + ${PREFIX}/lib/X11/config/Motif.rules + @${INSTALL_DATA} ${WRKSRC}/config/cf/Motif.tmpl \ + ${PREFIX}/lib/X11/config/Motif.tmpl -LIB_DEPENDS-demos= Xm.>=2.1,Uil.>=2.1,Mrm.>=2.1::x11/openmotif -RUN_DEPENDS-debuglibs= ::x11/openmotif -WANTLIB-debuglibs= -WANTLIB= ICE SM X11 Xext Xp Xt c m +LIB_DEPENDS= iconv.>=1.9::converters/libiconv +LIB_DEPENDS-demos= Xm.>=4.0,Mrm.>=4.0::x11/openmotif +WANTLIB= ICE SM X11 Xext Xp Xt c Xau Xdmcp Xft Xmu Xrender \ + expat fontconfig freetype z iconv +WANTLIB-demos= ${WANTLIB} m # XXX Large, complicated, only partially automated test suite available NO_REGRESS= Yes diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index fd8a13dc0f7..1d75c7b8826 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,35 +1,10 @@ MD5 (openmotif/index.html) = Z2Hxw15e1d5XAvi1S10GdA== -MD5 (openmotif/openmotif2.1.30.tar.gz) = FLJdhSVu9/ChqYm0thLJCQ== -MD5 (openmotif/patch1) = oFCXVhw2zr+85TKNHlqB4w== -MD5 (openmotif/patch2) = GMiH5TIvQZyGD103B7/CWw== -MD5 (openmotif/patch3) = IOZTN8yc+hQOL/ENUWLciA== -MD5 (openmotif/patch4) = e7tkv8gtLbBvUZIr5Z3aTA== -MD5 (openmotif/patch5) = 7ank0NDytjCHI0uw54mjEQ== +MD5 (openmotif/openmotif-2.3.0.tar.gz) = 74+Mpvb4C/uWNR8StVCymw== RMD160 (openmotif/index.html) = f4Z27j+/MGTXYCYxcIB7Ads5hQc= -RMD160 (openmotif/openmotif2.1.30.tar.gz) = tAS5Jdu2/k/2xSLt89D1EWN/uHI= -RMD160 (openmotif/patch1) = kWzh8HQv5YDVoFwSdj0+QILWNAw= -RMD160 (openmotif/patch2) = 0LV+LnAQBcyAOq8hRQVNz/FLEWs= -RMD160 (openmotif/patch3) = xiMi/eFlwF7du5cY0ieyPko7oN8= -RMD160 (openmotif/patch4) = v54d4shzUXUY/EKN0Z/m5JVtGEg= -RMD160 (openmotif/patch5) = QQyoutMr4j+mwLd25nutlYGdRh8= +RMD160 (openmotif/openmotif-2.3.0.tar.gz) = kO8lXvtmovYVPJQ98cdflujUmiI= SHA1 (openmotif/index.html) = QIRnNr1cRYhNZaWIHgoy5YuLZ64= -SHA1 (openmotif/openmotif2.1.30.tar.gz) = NPyC/fDiAFJYZGZeF5JG72QILcw= -SHA1 (openmotif/patch1) = cXlZxvHbugW4+PaW9xnLzKhPRLk= -SHA1 (openmotif/patch2) = f8mh6E6h72m0H/ArKstELXUAIRs= -SHA1 (openmotif/patch3) = Qn9KqRUpebhlPqChF3SW8Lyq/ec= -SHA1 (openmotif/patch4) = Y684ceVit59FRMN6eD4zlsM6Iew= -SHA1 (openmotif/patch5) = AQDBEAcU/0VLvUDRq8DaVmwD/m4= +SHA1 (openmotif/openmotif-2.3.0.tar.gz) = XNH4303o5OhRHy/7/tYYoohC/9Q= SHA256 (openmotif/index.html) = gt3Q8o81kpSDH34y2ZvhZQeizXEPgyFsu+GZJf4SHfg= -SHA256 (openmotif/openmotif2.1.30.tar.gz) = +mbqT5Y9s1Y+hBWL4z3eZuhVHFBy3lUR6aOuAEJNJhw= -SHA256 (openmotif/patch1) = RwjK+TEvtrqrCeAd6SVPI1/1wh6O4kLCT0Uff2fiMuQ= -SHA256 (openmotif/patch2) = XeE8FDWL10DM4iVxzbPrfMtlWLbLB6DP8vgJ1opbHwo= -SHA256 (openmotif/patch3) = jCPjm/ixpu9DhpI4gYl3izcqdQ8YQS0nlHVWcJ13MtA= -SHA256 (openmotif/patch4) = BpaR87DRfI4nTxPnH9ssYhm7JhrdBoO2O0qDTV8TdAI= -SHA256 (openmotif/patch5) = d1XxTCg3g1lAGL3NU6LrOoYycVfzHTzdlSnYaJ7JiDw= +SHA256 (openmotif/openmotif-2.3.0.tar.gz) = GMLtBssPbduCd8VXzQcdDvid2NjT85eu9A1ylxbytbQ= SIZE (openmotif/index.html) = 36411 -SIZE (openmotif/openmotif2.1.30.tar.gz) = 17711487 -SIZE (openmotif/patch1) = 630 -SIZE (openmotif/patch2) = 8258 -SIZE (openmotif/patch3) = 195096 -SIZE (openmotif/patch4) = 126297 -SIZE (openmotif/patch5) = 480141 +SIZE (openmotif/openmotif-2.3.0.tar.gz) = 6001356 diff --git a/x11/openmotif/patches/patch-Imakefile b/x11/openmotif/patches/patch-Imakefile index b7bc9b85aac..f9a25968fee 100644 --- a/x11/openmotif/patches/patch-Imakefile +++ b/x11/openmotif/patches/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Mon Nov 20 13:42:49 2000 -+++ Imakefile Mon Nov 20 20:35:18 2000 -@@ -90,7 +90,7 @@ +--- Imakefile.orig Sat Jun 30 09:54:52 2007 ++++ Imakefile Sat Jun 30 09:55:15 2007 +@@ -90,7 +90,7 @@ XCOMM #ifdef UseInstalled TESTS_IMAKE = $(IMAKE) -DUseInstalled #else diff --git a/x11/openmotif/patches/patch-Makefile b/x11/openmotif/patches/patch-Makefile deleted file mode 100644 index 64ae3ba0960..00000000000 --- a/x11/openmotif/patches/patch-Makefile +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig Wed May 3 02:12:34 2000 -+++ Makefile Mon Nov 20 19:36:43 2000 -@@ -59,7 +59,7 @@ - DEPENDTOP = ../.. - IMAKETOP = ../.. - IRULESRC = $(CONFIGSRC)/cf -- IMAKE = $(IMAKESRC)/imake -+ IMAKE = /usr/X11R6/bin/imake - IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) - MAKE_OPTS = -f xmakefile - MAKE_CMD = $(MAKE) $(MAKE_OPTS) -@@ -95,7 +95,7 @@ - ;; esac; - @date - @echo "" -- cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean -+# cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot - $(MAKE_CMD) $(MFLAGS) VerifyOS - $(MAKE_CMD) $(MFLAGS) Makefiles -@@ -115,7 +115,12 @@ - # This is just a sequence of bootstrapping steps we have to do. - # The steps are listed as separate targets so clearmake can wink in - # the Makefile.proto files. --Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap -+#Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap -+Makefile.boot: -+ -@if [ -f xmakefile ]; then set -x; \ -+ $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \ -+ else exit 0; fi -+ $(MAKE) $(MFLAGS) xmakefile - - imake.proto: - cd $(IMAKESRC) && $(MAKE) $(FLAGS) diff --git a/x11/openmotif/patches/patch-Makefile_imake-pure b/x11/openmotif/patches/patch-Makefile_imake-pure new file mode 100644 index 00000000000..2690861b189 --- /dev/null +++ b/x11/openmotif/patches/patch-Makefile_imake-pure @@ -0,0 +1,17 @@ +$OpenBSD: patch-Makefile_imake-pure,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- Makefile.imake-pure.orig Sat Jun 30 09:55:02 2007 ++++ Makefile.imake-pure Sat Jun 30 09:55:55 2007 +@@ -115,7 +115,12 @@ World: + # This is just a sequence of bootstrapping steps we have to do. + # The steps are listed as separate targets so clearmake can wink in + # the Makefile.proto files. +-Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap ++#Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap ++Makefile.boot: ++ -@if [ -f xmakefile ]; then set -x; \ ++ $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \ ++ else exit 0; fi ++ $(MAKE) $(MFLAGS) xmakefile + + imake.proto: + cd $(IMAKESRC) && $(MAKE) $(FLAGS) diff --git a/x11/openmotif/patches/patch-bindings-Imakefile b/x11/openmotif/patches/patch-bindings-Imakefile index e2aaeaadda3..2cfb15396dc 100644 --- a/x11/openmotif/patches/patch-bindings-Imakefile +++ b/x11/openmotif/patches/patch-bindings-Imakefile @@ -1,6 +1,6 @@ ---- bindings/Imakefile.orig Tue Nov 21 01:12:42 2000 -+++ bindings/Imakefile Tue Nov 21 01:13:20 2000 -@@ -41,6 +41,7 @@ +--- bindings/Imakefile.orig Sat Jun 30 09:56:21 2007 ++++ bindings/Imakefile Sat Jun 30 09:56:48 2007 +@@ -41,6 +41,7 @@ INSTALLFLAGS = $(INSTINCFLAGS) FILES = \ xmbind.alias \ diff --git a/x11/openmotif/patches/patch-bitmaps-Imakefile b/x11/openmotif/patches/patch-bitmaps-Imakefile index ab46800189e..afb9a60cfd7 100644 --- a/x11/openmotif/patches/patch-bitmaps-Imakefile +++ b/x11/openmotif/patches/patch-bitmaps-Imakefile @@ -1,6 +1,6 @@ ---- bitmaps/Imakefile.orig Mon Nov 20 23:49:48 2000 -+++ bitmaps/Imakefile Tue Nov 21 00:39:02 2000 -@@ -56,4 +56,4 @@ +--- bitmaps/Imakefile.orig Sat Jun 30 10:01:51 2007 ++++ bitmaps/Imakefile Sat Jun 30 10:02:28 2007 +@@ -56,4 +56,4 @@ HEADERS = \ all:: diff --git a/x11/openmotif/patches/patch-clients-mwm-Imakefile b/x11/openmotif/patches/patch-clients-mwm-Imakefile deleted file mode 100644 index 91e32a97a8c..00000000000 --- a/x11/openmotif/patches/patch-clients-mwm-Imakefile +++ /dev/null @@ -1,20 +0,0 @@ ---- clients/mwm/Imakefile.orig Mon Nov 20 13:42:43 2000 -+++ clients/mwm/Imakefile Mon Nov 20 19:07:39 2000 -@@ -176,7 +176,7 @@ - NormalLibraryObjectRule() - MComplexProgramTarget_1(mwm,$(LOCAL_LIBRARIES),$(SYSTEM_LIBRARIES)) - --SpecialObjectRule(WmResParse.o,NullParameter,-DLIBDIR='"'$(XPROJECTROOT)/lib/X11'"') -+SpecialObjectRule(WmResParse.o,NullParameter,-DLIBDIR='"'$(PROJECTROOT)/lib/X11'"') - SpecialObjectRule(WmResource.o,NullParameter,-DBITMAPDIR='"'$(XPROJECTROOT)/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),) - */ - --InstallNonExecFile(system.mwmrc,$(XPROJECTROOT)/lib/X11) -+InstallNonExecFile(system.mwmrc,$(PROJECTROOT)/lib/X11) - InstallAppDefaults(Mwm) - - MessageCatalogRule(Mwm) diff --git a/x11/openmotif/patches/patch-clients_mwm_WmFunction_c b/x11/openmotif/patches/patch-clients_mwm_WmFunction_c index ea5cb75ba48..63123fbbe8c 100644 --- a/x11/openmotif/patches/patch-clients_mwm_WmFunction_c +++ b/x11/openmotif/patches/patch-clients_mwm_WmFunction_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-clients_mwm_WmFunction_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $ ---- clients/mwm/WmFunction.c.orig Sun Dec 29 00:45:44 2002 -+++ clients/mwm/WmFunction.c Sun Dec 29 00:46:39 2002 -@@ -1119,12 +1119,12 @@ Boolean F_Exec (String args, ClientData +$OpenBSD: patch-clients_mwm_WmFunction_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $ +--- clients/mwm/WmFunction.c.orig Sat Jun 30 10:04:45 2007 ++++ clients/mwm/WmFunction.c Sat Jun 30 10:05:44 2007 +@@ -1126,12 +1126,12 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent * directory, then we must call execlp and not execl */ shellname = shell; @@ -16,7 +16,7 @@ $OpenBSD: patch-clients_mwm_WmFunction_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp } } -@@ -1133,9 +1133,9 @@ Boolean F_Exec (String args, ClientData +@@ -1140,9 +1140,9 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent * * Try /bin/sh . */ #ifdef SVR4 diff --git a/x11/openmotif/patches/patch-config-Imakefile b/x11/openmotif/patches/patch-config-Imakefile index 39068de7ca0..9ab924599c1 100644 --- a/x11/openmotif/patches/patch-config-Imakefile +++ b/x11/openmotif/patches/patch-config-Imakefile @@ -1,12 +1,12 @@ ---- config/Imakefile.orig Fri Apr 28 08:04:08 2000 -+++ config/Imakefile Mon Nov 20 20:45:12 2000 -@@ -5,7 +5,8 @@ +--- config/Imakefile.orig Sat Jun 30 10:06:11 2007 ++++ config/Imakefile Sat Jun 30 10:07:04 2007 +@@ -5,7 +5,8 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04 #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" -BOOTSTRAPSUBDIRS = imake makedepend +/* we don't need to build imake and makedepend */ +/* BOOTSTRAPSUBDIRS = imake makedepend */ - SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util + SUBDIRS = $(BOOTSTRAPSUBDIRS) util MakeSubdirs($(SUBDIRS)) diff --git a/x11/openmotif/patches/patch-config-cf-Imakefile b/x11/openmotif/patches/patch-config-cf-Imakefile index 1aea0f10092..4f255fab6ac 100644 --- a/x11/openmotif/patches/patch-config-cf-Imakefile +++ b/x11/openmotif/patches/patch-config-cf-Imakefile @@ -1,31 +1,32 @@ ---- config/cf/Imakefile.orig Thu Apr 5 22:22:54 2001 -+++ config/cf/Imakefile Thu Apr 5 22:23:44 2001 -@@ -121,15 +121,15 @@ +--- config/cf/Imakefile.orig Sat Jun 30 10:07:23 2007 ++++ config/cf/Imakefile Sat Jun 30 10:09:58 2007 +@@ -121,16 +121,16 @@ x386.cf \ QNX.cf \ xfree86.cf -INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) -+/* We only need to install Motif.tmpl, and Motif.rules. */ ++/* we only need to install Motif.tmpl and Motif.rules */ +INSTFILES = Motif.tmpl Motif.rules all:: InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS)) -+#if defined(XFree86Version) && XFree86Version < 4000 ++#if defined(XFree86Version) && Xfree86Version < 4000 InstallLinkKitMultipleDestFlags($(INSTFILES),$(LINKKITDIR)/config/cf,$(INSTDATFLAGS)) -- --InstallNamedNonExec(Motif.rules,Motif.rules.openmotif,$(CONFIGDIR)) --InstallNamedNonExec(Motif.tmpl,Motif.tmpl.openmotif,$(CONFIGDIR)) +#endif +-InstallNamedNonExec(Motif.rules,Motif.rules.openmotif,$(CONFIGDIR)) +-InstallNamedNonExec(Motif.tmpl,Motif.tmpl.openmotif,$(CONFIGDIR)) +- #ifdef InstallEmptyHostDef install:: -@@ -140,7 +140,7 @@ + @(TMP=/tmp/tmp.$$$$; \ +@@ -140,7 +140,7 @@ install:: $(DESTDIR)$(CONFIGDIR)/host.def; \ RemoveFile($${TMP})) -#ifdef XFree86Version -+#if defined(XFree86Version) && XFree86Version < 4000 ++#if definded(XFree86Version) && XFreeVersion < 4000 install.linkkit:: @(TMP=/tmp/tmp.$$$$; \ RemoveFile($${TMP}); \ diff --git a/x11/openmotif/patches/patch-config-cf-Motif.rules b/x11/openmotif/patches/patch-config-cf-Motif.rules index 4933201a70d..ebebf8e352c 100644 --- a/x11/openmotif/patches/patch-config-cf-Motif.rules +++ b/x11/openmotif/patches/patch-config-cf-Motif.rules @@ -1,19 +1,19 @@ ---- config/cf/Motif.rules.orig Tue May 2 11:53:43 2000 -+++ config/cf/Motif.rules Wed Aug 9 19:29:43 2000 -@@ -50,9 +50,10 @@ +--- config/cf/Motif.rules.orig Sat Jun 30 10:10:29 2007 ++++ config/cf/Motif.rules Sat Jun 30 10:17:42 2007 +@@ -50,10 +50,10 @@ XCOMM $TOG: Motif.rules /main/8 1999/03/22 15:12:48 mg # define MotifIsTopLevelProject NO #endif -/* Include the X11 project rules file. */ +#ifndef X11IsTopLevelProject -+/* If we have not included X11.rules yet, do it now. */ #include -- +#endif +- /* Use the in-tree Motif by default. */ #ifndef UseInstalledMotif -@@ -655,7 +656,7 @@ + # define UseInstalledMotif NO +@@ -698,7 +698,7 @@ clean:: @@\ #define Real_MessageCatalogRule(prefix) @@\ prefix.cat Concat(prefix,MsgCatI.h): @@\ $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ diff --git a/x11/openmotif/patches/patch-config-cf-Motif.tmpl b/x11/openmotif/patches/patch-config-cf-Motif.tmpl index 28fd524a79e..525e04a6f00 100644 --- a/x11/openmotif/patches/patch-config-cf-Motif.tmpl +++ b/x11/openmotif/patches/patch-config-cf-Motif.tmpl @@ -1,6 +1,6 @@ ---- config/cf/Motif.tmpl.orig Sun May 8 20:17:11 2005 -+++ config/cf/Motif.tmpl Sun May 8 20:27:04 2005 -@@ -179,7 +179,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/1 +--- config/cf/Motif.tmpl.orig Sat Jan 5 16:20:50 2002 ++++ config/cf/Motif.tmpl Sat Jun 30 11:57:54 2007 +@@ -179,7 +179,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr # define YaccFlags /**/ #endif @@ -9,12 +9,12 @@ #ifndef BuildMotifConfig # define BuildMotifConfig YES -@@ -396,7 +396,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/1 +@@ -396,7 +396,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr /* hardcoded default path. Contrary to the original duplicate of USRLIBDIR in the Imakefiles. */ #ifndef VirtualBindingsPath -# define VirtualBindingsPath $(USRLIBDIR)/Xm/bindings -+# define VirtualBindingsPath %%PREFIX%%/lib/X11/bindings ++# define VirtualBindingsPath /usr/local/lib/X11/bindings #endif MTOP = MTop diff --git a/x11/openmotif/patches/patch-config-cf-host.def b/x11/openmotif/patches/patch-config-cf-host.def index 9f829c48726..605cde761fd 100644 --- a/x11/openmotif/patches/patch-config-cf-host.def +++ b/x11/openmotif/patches/patch-config-cf-host.def @@ -1,24 +1,22 @@ ---- config/cf/host.def.orig Mon Nov 20 21:11:53 2000 -+++ config/cf/host.def Mon Nov 20 20:53:56 2000 -@@ -1,17 +1,129 @@ - #ifdef BeforeVendorCF - +--- config/cf/host.def.orig Mon Jan 7 19:10:03 2002 ++++ config/cf/host.def Sat Jun 30 11:57:54 2007 +@@ -1,13 +1,128 @@ #define TopLevelProject Motif -#define ProjectRoot /usr/X11R6 -+#define ProjectRoot %%PREFIX%% ++#define ProjectRoot /usr/local #define X11ProjectRoot /usr/X11R6 --#define VirtualBindingsPath $(LIBDIR)/bindings -+#define VirtualBindingsPath %%PREFIX%%/lib/X11/bindings +-#define VirtualBindingsPath /usr/X11R6/lib/X11/bindings ++#define VirtualBindingsPath /usr/local/lib/X11/bindings #define ImportX11 YES -#define USE_BYACC YES #define NoMessageCatalog YES #define ForceNormalLib YES --#define HasVarDirectory NO - #define DebugLibXm YES - #define DebugLibMrm YES - #define DebugLibUil YES + #define DebugLibXm NO + #define DebugLibMrm NO + #define DebugLibUil NO -#define LexLib -lfl - + #define ExtraWidgets YES ++ +#define DependCmd /usr/X11R6/bin/makedepend +#define ExtraLoadOptions -L$(BUILDLIBDIR) + @@ -40,7 +38,7 @@ + fi @@\ + @@\ +clean:: @@\ -+ RemoveFile(file.section.new) +++ RemoveFile(file.section.new) + +/* + * install unformated man page @@ -114,7 +112,7 @@ + exit 1; \ @@\ + fi; \ @@\ + done - #endif /* BeforeVendorCF */ ++#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF +#ifndef ImakeCmd @@ -132,6 +130,6 @@ +#define ManSourcePath $(MANPATH)/man + +#undef ConfigDir -+#define ConfigDir %%PREFIX%%/lib/X11/config ++#define ConfigDir /usr/local/lib/X11/config + +#endif /* AfterVendorCF */ diff --git a/x11/openmotif/patches/patch-config-cf-site.def b/x11/openmotif/patches/patch-config-cf-site.def index c5b2cc2b8a4..1682ded5232 100644 --- a/x11/openmotif/patches/patch-config-cf-site.def +++ b/x11/openmotif/patches/patch-config-cf-site.def @@ -1,6 +1,6 @@ ---- config/cf/site.def.orig Mon Nov 20 13:43:35 2000 -+++ config/cf/site.def Mon Nov 20 21:07:04 2000 -@@ -67,6 +67,10 @@ +--- config/cf/site.def.orig Sat Jan 5 16:20:53 2002 ++++ config/cf/site.def Sat Jun 30 10:24:41 2007 +@@ -67,6 +67,10 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.17.2. #endif */ diff --git a/x11/openmotif/patches/patch-config-imake-Imakefile b/x11/openmotif/patches/patch-config-imake-Imakefile index d844e2a2b4b..4b49ef7324f 100644 --- a/x11/openmotif/patches/patch-config-imake-Imakefile +++ b/x11/openmotif/patches/patch-config-imake-Imakefile @@ -1,6 +1,6 @@ ---- config/imake/Imakefile.orig Thu Apr 5 22:23:13 2001 -+++ config/imake/Imakefile Thu Apr 5 22:24:01 2001 -@@ -30,7 +30,9 @@ +--- config/imake/Imakefile.orig Sat Jan 5 16:20:55 2002 ++++ config/imake/Imakefile Sat Jun 30 10:24:59 2007 +@@ -30,7 +30,9 @@ SimpleHostProgramTarget(imake) #else SimpleProgramTarget(imake) #endif diff --git a/x11/openmotif/patches/patch-config-makedepend-Imakefile b/x11/openmotif/patches/patch-config-makedepend-Imakefile index 74232050b09..5f6ef94b281 100644 --- a/x11/openmotif/patches/patch-config-makedepend-Imakefile +++ b/x11/openmotif/patches/patch-config-makedepend-Imakefile @@ -1,6 +1,6 @@ ---- config/makedepend/Imakefile.orig Thu Apr 5 22:23:30 2001 -+++ config/makedepend/Imakefile Thu Apr 5 22:24:13 2001 -@@ -89,4 +89,6 @@ +--- config/makedepend/Imakefile.orig Sat Jan 5 16:20:56 2002 ++++ config/makedepend/Imakefile Sat Jun 30 10:25:11 2007 +@@ -89,4 +89,6 @@ all:: $(CP) ProgramTargetName(makedepend) / #endif diff --git a/x11/openmotif/patches/patch-config-util-Imakefile b/x11/openmotif/patches/patch-config-util-Imakefile index 2273d06ef31..348836390b0 100644 --- a/x11/openmotif/patches/patch-config-util-Imakefile +++ b/x11/openmotif/patches/patch-config-util-Imakefile @@ -1,5 +1,5 @@ ---- config/util/Imakefile.orig Fri Apr 28 08:04:07 2000 -+++ config/util/Imakefile Mon Nov 20 19:53:03 2000 +--- config/util/Imakefile.orig Fri Jan 4 22:12:10 2002 ++++ config/util/Imakefile Sat Jun 30 10:25:24 2007 @@ -1,65 +1,9 @@ XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -#if UseCCMakeDepend @@ -9,7 +9,8 @@ -#ifdef ExportListGenSource -EXPORTLISTGEN = exportlistgen -#endif -- ++PROGRAMS = ProgramTargetName(makestrs) + -#ifdef Win32Architecture -CMKDIRHIER = mkdirhier.exe -#endif @@ -24,8 +25,7 @@ -XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. - LDPRELIB = - LDPRELIBS = -+PROGRAMS = ProgramTargetName(makestrs) - +- all:: $(PROGRAMS) includes:: ProgramTargetName(makestrs) diff --git a/x11/openmotif/patches/patch-config_cf_bsdLib_tmpl b/x11/openmotif/patches/patch-config_cf_bsdLib_tmpl index 3f6c3c3b56a..929d9e1db1a 100644 --- a/x11/openmotif/patches/patch-config_cf_bsdLib_tmpl +++ b/x11/openmotif/patches/patch-config_cf_bsdLib_tmpl @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.1 2001/09/30 07:21:44 pvalchev Exp $ ---- config/cf/bsdLib.tmpl.orig Sat Sep 29 16:23:36 2001 -+++ config/cf/bsdLib.tmpl Sat Sep 29 16:26:02 2001 +$OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.2 2007/07/18 21:41:05 mbalmer Exp $ +--- config/cf/bsdLib.tmpl.orig Sat Jan 5 16:20:51 2002 ++++ config/cf/bsdLib.tmpl Sat Jun 30 10:25:57 2007 @@ -1,5 +1,5 @@ XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.3 1999/12/02 14:27:24 hohndel Exp $ @@ -8,7 +8,7 @@ $OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.1 2001/09/30 07:21:44 pvalchev Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template -@@ -7,12 +7,6 @@ +@@ -7,12 +7,6 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.3 199 #if !UseElfFormat @@ -21,7 +21,7 @@ $OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.1 2001/09/30 07:21:44 pvalchev Exp $ #ifndef SharedXtReqs #define SharedXtReqs /**/ #endif -@@ -42,26 +36,20 @@ +@@ -42,26 +36,20 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif #ifndef XawClientLibs @@ -55,7 +55,7 @@ $OpenBSD: patch-config_cf_bsdLib_tmpl,v 1.1 2001/09/30 07:21:44 pvalchev Exp $ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XLIBONLY) #define SharedXiReqs $(LDPRELIB) $(XLIB) -@@ -72,9 +60,10 @@ +@@ -72,9 +60,10 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs #define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs diff --git a/x11/openmotif/patches/patch-demos_lib_Exm_wml_Makefile_in b/x11/openmotif/patches/patch-demos_lib_Exm_wml_Makefile_in new file mode 100644 index 00000000000..29a5d40db38 --- /dev/null +++ b/x11/openmotif/patches/patch-demos_lib_Exm_wml_Makefile_in @@ -0,0 +1,31 @@ +$OpenBSD: patch-demos_lib_Exm_wml_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/lib/Exm/wml/Makefile.in.orig Sat Jun 30 12:54:11 2007 ++++ demos/lib/Exm/wml/Makefile.in Sat Jun 30 12:54:34 2007 +@@ -14,6 +14,7 @@ + + @SET_MAKE@ + ++RM=rm + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -521,16 +522,16 @@ $(WMDTABLE): wmldbcreate $(TARGETS) + UilLexPars.c UilLexPars.h: $(UILY) + + $(TARGETS): $(TABLE) $(WMLDIR)/motif.wml +- $(RM) $(TARGETS) $(REPORT) wml-uil.mm ++ -$(RM) $(TARGETS) $(REPORT) wml-uil.mm + # $(YACC) -d $(YACCFLAGS) $(UILY) + # $(MV) y.tab.c UilLexPars.c + # $(MV) y.tab.h UilLexPars.h + $(top_builddir)/tools/wml/wmluiltok < $(UILY) > tokens.dat + # $(RM) wml-uil.mm +- $(RM) Exm.h ++ -$(RM) Exm.h + $(LN_S) $(srcdir)/$(TABLE) ./Exm.h + $(CPP) -I$(WMLDIR) Exm.h | $(top_builddir)/tools/wml/wml +- $(RM) Exm.h ++ -$(RM) Exm.h + # $(RM) tokens.dat + # + # $(WMDTABLE): wmldbcreate diff --git a/x11/openmotif/patches/patch-demos_programs_Imakefile b/x11/openmotif/patches/patch-demos_programs_Imakefile index eb6b82699e6..0348e4d673d 100644 --- a/x11/openmotif/patches/patch-demos_programs_Imakefile +++ b/x11/openmotif/patches/patch-demos_programs_Imakefile @@ -1,11 +1,10 @@ ---- demos/programs/Imakefile.orig Wed Mar 5 18:14:13 2003 -+++ demos/programs/Imakefile Wed Mar 5 18:14:39 2003 -@@ -42,7 +42,7 @@ - - SUBDIRS = Exm airport animate drag_and_drop draw earth filemanager fileview \ - getsubres hellomotif hellomotifi18n i18ninput periodic \ -- piano popups sampler2_0 setdate todo -+ piano popups sampler2_0 setdate - - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) +--- demos/programs/Imakefile.orig Tue Jan 29 18:22:33 2002 ++++ demos/programs/Imakefile Sat Jun 30 10:26:55 2007 +@@ -57,7 +57,6 @@ SUBDIRS = airport \ + sampler2_0 \ + setdate \ + Exm \ +- todo \ + workspace \ + hellomotifi18n \ + tooltips \ diff --git a/x11/openmotif/patches/patch-demos_programs_animate_Makefile_in b/x11/openmotif/patches/patch-demos_programs_animate_Makefile_in new file mode 100644 index 00000000000..d3f141912a4 --- /dev/null +++ b/x11/openmotif/patches/patch-demos_programs_animate_Makefile_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-demos_programs_animate_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/programs/animate/Makefile.in.orig Sat Jun 30 13:25:27 2007 ++++ demos/programs/animate/Makefile.in Sat Jun 30 13:25:57 2007 +@@ -542,16 +542,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA + all: dog.uid plane.uid superman.uid xmanimate.uid + + dog.uid: dog.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ dog.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + plane.uid: plane.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ plane.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + superman.uid: superman.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ superman.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + xmanimate.uid: xmanimate.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ xmanimate.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + clean-local: + $(RM) periodic.uid diff --git a/x11/openmotif/patches/patch-demos_programs_fileview_Makefile_in b/x11/openmotif/patches/patch-demos_programs_fileview_Makefile_in new file mode 100644 index 00000000000..03f72c77f99 --- /dev/null +++ b/x11/openmotif/patches/patch-demos_programs_fileview_Makefile_in @@ -0,0 +1,20 @@ +$OpenBSD: patch-demos_programs_fileview_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/programs/fileview/Makefile.in.orig Sat Jun 30 13:26:06 2007 ++++ demos/programs/fileview/Makefile.in Sat Jun 30 13:26:24 2007 +@@ -536,13 +536,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA + all: French.uid German.uid English.uid + + French.uid: French.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ French.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + German.uid: German.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ German.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + English.uid: English.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ English.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + clean-local: + $(RM) French.uid German.uid English.uid diff --git a/x11/openmotif/patches/patch-demos_programs_hellomotif_Makefile_in b/x11/openmotif/patches/patch-demos_programs_hellomotif_Makefile_in new file mode 100644 index 00000000000..dc56e2f3e4d --- /dev/null +++ b/x11/openmotif/patches/patch-demos_programs_hellomotif_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-demos_programs_hellomotif_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/programs/hellomotif/Makefile.in.orig Sat Jun 30 13:26:32 2007 ++++ demos/programs/hellomotif/Makefile.in Sat Jun 30 13:26:46 2007 +@@ -531,7 +531,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA + all: hellomotif.uid + + hellomotif.uid: hellomotif.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ hellomotif.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + clean-local: + $(RM) hellomotif.uid diff --git a/x11/openmotif/patches/patch-demos_programs_periodic_Makefile_in b/x11/openmotif/patches/patch-demos_programs_periodic_Makefile_in new file mode 100644 index 00000000000..edb8893794a --- /dev/null +++ b/x11/openmotif/patches/patch-demos_programs_periodic_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-demos_programs_periodic_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/programs/periodic/Makefile.in.orig Sat Jun 30 13:26:54 2007 ++++ demos/programs/periodic/Makefile.in Sat Jun 30 13:27:09 2007 +@@ -531,7 +531,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA + all: periodic.uid + + periodic.uid: periodic.uil +- ../../../clients/uil/uil -o $@ $< -I$(srcdir)/../../../clients/uil -I../../../clients/uil ++ ../../../clients/uil/uil -o $@ periodic.uil -I$(srcdir)/../../../clients/uil -I../../../clients/uil + + clean-local: + $(RM) periodic.uid diff --git a/x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c b/x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c index dda0a21842c..460790c91d6 100644 --- a/x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c +++ b/x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $ ---- demos/unsupported/motifshell/motifshell.c.orig Sun Dec 29 00:47:05 2002 -+++ demos/unsupported/motifshell/motifshell.c Sun Dec 29 00:47:27 2002 -@@ -598,7 +598,7 @@ void SysCall (Widget widget, char *syste +$OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $ +--- demos/unsupported/motifshell/motifshell.c.orig Tue Jan 29 17:16:39 2002 ++++ demos/unsupported/motifshell/motifshell.c Sat Jun 30 10:27:21 2007 +@@ -598,7 +598,7 @@ void SysCall (Widget widget, char *systemCommand, Bool if ((p = fork()) == 0) { /* note - execlp uses PATH */ @@ -10,7 +10,7 @@ $OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.1 2002/12/29 09:34 /* if we fail to find the systemCommand, use 'find' to look for it. */ fprintf(stderr, "can't find %s\n", systemCommand); -@@ -629,7 +629,7 @@ void SysCall (Widget widget, char *syste +@@ -629,7 +629,7 @@ void SysCall (Widget widget, char *systemCommand, Bool setenv("UIDPATH", uidpath, 1); #endif } diff --git a/x11/openmotif/patches/patch-doc-man-Imakefile b/x11/openmotif/patches/patch-doc-man-Imakefile deleted file mode 100644 index 6bbf98a900d..00000000000 --- a/x11/openmotif/patches/patch-doc-man-Imakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- doc/man/Imakefile.orig Mon Nov 20 13:42:48 2000 -+++ doc/man/Imakefile Mon Nov 20 14:05:03 2000 -@@ -11,7 +11,6 @@ - MakeDir($(DESTDIR)$(MANDIR)) - MakeDir($(DESTDIR)$(LIBMANDIR)) - MakeDir($(DESTDIR)$(FILEMANDIR)) -- MakeDir($(DESTDIR)$(MISCMANDIR)) - - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) diff --git a/x11/openmotif/patches/patch-doc-man-man3-XmDisplay.3 b/x11/openmotif/patches/patch-doc-man-man3-XmDisplay.3 index b232658b9eb..b2a80446418 100644 --- a/x11/openmotif/patches/patch-doc-man-man3-XmDisplay.3 +++ b/x11/openmotif/patches/patch-doc-man-man3-XmDisplay.3 @@ -1,6 +1,15 @@ ---- doc/man/man3/XmDisplay.3.orig Wed Nov 22 18:14:59 2000 -+++ doc/man/man3/XmDisplay.3 Wed Nov 22 19:05:56 2000 -@@ -263,7 +263,7 @@ +--- doc/man/man3/XmDisplay.3.orig Fri Jan 4 22:55:51 2002 ++++ doc/man/man3/XmDisplay.3 Sat Jun 30 14:00:06 2007 +@@ -46,7 +46,7 @@ + .ds f3\" + .ds f4\" + .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +-.TH "XmDisplay" "library call" ++.TH "XmDisplay" "3" + .SH "NAME" + \fBXmDisplay\fP \(em The Display widget class + .iX "XmDisplay" +@@ -263,7 +263,7 @@ decision matrix is described in the following table\&. .TS tab() box; c| c s s s c diff --git a/x11/openmotif/patches/patch-doc-man-man5-Imakefile b/x11/openmotif/patches/patch-doc-man-man5-Imakefile deleted file mode 100644 index d4464a9b1a6..00000000000 --- a/x11/openmotif/patches/patch-doc-man-man5-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/man/man5/Imakefile.orig Mon Nov 20 14:01:54 2000 -+++ doc/man/man5/Imakefile Mon Nov 20 14:03:11 2000 -@@ -1,7 +1,7 @@ - XCOMM Imakefile - --MANDIR = $(MISCMANDIR) --MANSUFFIX = $(MISCMANSUFFIX) -+MANDIR = $(FILEMANDIR) -+MANSUFFIX = $(FILEMANSUFFIX) - - all:: - diff --git a/x11/openmotif/patches/patch-doc-man-man5-UIL.5 b/x11/openmotif/patches/patch-doc-man-man5-UIL.5 index 8a98d4d3107..3193efd02cc 100644 --- a/x11/openmotif/patches/patch-doc-man-man5-UIL.5 +++ b/x11/openmotif/patches/patch-doc-man-man5-UIL.5 @@ -1,6 +1,15 @@ ---- doc/man/man5/UIL.5.orig Wed Nov 22 18:15:12 2000 -+++ doc/man/man5/UIL.5 Wed Nov 22 19:01:14 2000 -@@ -1071,8 +1071,7 @@ +--- doc/man/man5/UIL.5.orig Fri Jan 4 22:56:47 2002 ++++ doc/man/man5/UIL.5 Sat Jun 30 14:00:07 2007 +@@ -46,7 +46,7 @@ + .ds f3\" + .ds f4\" + .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +-.TH "UIL" "file formats" ++.TH "UIL" "5" + .SH "NAME" + \fBUIL\fP \(em The user interface language file format + .iX "user interface language" +@@ -1071,8 +1071,7 @@ allocation per use\&. .TS tab() box; c s s s diff --git a/x11/openmotif/patches/patch-lib-Xm-Scale.c b/x11/openmotif/patches/patch-lib-Xm-Scale.c index 8eb1ff07094..8fef964d8a0 100644 --- a/x11/openmotif/patches/patch-lib-Xm-Scale.c +++ b/x11/openmotif/patches/patch-lib-Xm-Scale.c @@ -1,6 +1,6 @@ ---- lib/Xm/Scale.c.orig Mon Nov 20 13:42:57 2000 -+++ lib/Xm/Scale.c Mon Nov 20 17:39:29 2000 -@@ -2751,7 +2751,11 @@ +--- lib/Xm/Scale.c.orig Sat May 7 09:11:14 2005 ++++ lib/Xm/Scale.c Sat Jun 30 10:30:20 2007 +@@ -2808,7 +2808,11 @@ GetValueString( { register int i; int diff, dec_point_size; @@ -12,7 +12,7 @@ if (sw->scale.decimal_points > 0) { /* Add one to decimal points to get leading zero, since -@@ -2759,15 +2763,23 @@ +@@ -2816,15 +2820,23 @@ GetValueString( sprintf (buffer,"%.*d", sw->scale.decimal_points+1, value); diff = strlen(buffer) - sw->scale.decimal_points; diff --git a/x11/openmotif/patches/patch-lib-Xm-TextF.c b/x11/openmotif/patches/patch-lib-Xm-TextF.c deleted file mode 100644 index 82fca1b392e..00000000000 --- a/x11/openmotif/patches/patch-lib-Xm-TextF.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Xm/TextF.c.orig Mon Nov 20 13:42:59 2000 -+++ lib/Xm/TextF.c Mon Nov 20 17:28:52 2000 -@@ -84,7 +84,7 @@ - #include /* for XmIsPrintShell */ - - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) - /* - * Modification by Integrated Computer Solutions, Inc. May 2000 - * diff --git a/x11/openmotif/patches/patch-lib_Xm_Makefile_in b/x11/openmotif/patches/patch-lib_Xm_Makefile_in new file mode 100644 index 00000000000..858ce2aa778 --- /dev/null +++ b/x11/openmotif/patches/patch-lib_Xm_Makefile_in @@ -0,0 +1,22 @@ +$OpenBSD: patch-lib_Xm_Makefile_in,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- lib/Xm/Makefile.in.orig Sat Jun 30 12:07:31 2007 ++++ lib/Xm/Makefile.in Sat Jun 30 12:08:52 2007 +@@ -161,7 +161,8 @@ am_libXm_la_OBJECTS = $(am__objects_1) $(am__objects_2 + $(am__objects_6) $(am__objects_7) $(am__objects_8) \ + $(am__objects_9) $(am__objects_10) $(am__objects_11) + libXm_la_OBJECTS = $(am_libXm_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I. ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I. \ ++ -I/usr/local/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -248,7 +249,7 @@ LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBDIR = @LIBDIR@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -L/usr/local/lib -liconv + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ diff --git a/x11/openmotif/patches/patch-lib_Xm_Xmos_r_h b/x11/openmotif/patches/patch-lib_Xm_Xmos_r_h new file mode 100644 index 00000000000..c9c03b04f3e --- /dev/null +++ b/x11/openmotif/patches/patch-lib_Xm_Xmos_r_h @@ -0,0 +1,14 @@ +$OpenBSD: patch-lib_Xm_Xmos_r_h,v 1.1 2007/07/18 21:41:05 mbalmer Exp $ +--- lib/Xm/Xmos_r.h.orig Sat Jun 30 11:59:19 2007 ++++ lib/Xm/Xmos_r.h Sat Jun 30 12:01:19 2007 +@@ -215,6 +215,10 @@ extern void XtProcessUnlock( + * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams); + */ + ++#if defined (__OpenBSD__) ++#define XNO_MTSAFE_PWDAPI ++#endif ++ + #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H) + # include + # if defined(XUSE_MTSAFE_API) || defined(XUSE_MTSAFE_PWDAPI) diff --git a/x11/openmotif/patches/patch-lib_Xm_XpmAttrib_c b/x11/openmotif/patches/patch-lib_Xm_XpmAttrib_c deleted file mode 100644 index 310e7695fd7..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_XpmAttrib_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-lib_Xm_XpmAttrib_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/XpmAttrib.c.orig Fri Apr 28 09:05:22 2000 -+++ lib/Xm/XpmAttrib.c Wed Sep 1 01:31:33 2004 -@@ -36,7 +36,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -47,11 +47,14 @@ LFUNC(FreeOldColorTable, void, (XpmColor - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; -+ -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; - - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { diff --git a/x11/openmotif/patches/patch-lib_Xm_XpmCrDatFrI_c b/x11/openmotif/patches/patch-lib_Xm_XpmCrDatFrI_c deleted file mode 100644 index dd10778ce5b..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_XpmCrDatFrI_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Xm_XpmCrDatFrI_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/XpmCrDatFrI.c.orig Fri Apr 28 09:05:22 2000 -+++ lib/Xm/XpmCrDatFrI.c Wed Sep 1 01:31:33 2004 -@@ -129,6 +129,8 @@ XpmCreateDataFromXpmImage(data_return, i - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -+ if (header_size >= SIZE_MAX / sizeof(char *)) -+ return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-lib_Xm_XpmI_h b/x11/openmotif/patches/patch-lib_Xm_XpmI_h index 16d15dbd90a..b73c84551f9 100644 --- a/x11/openmotif/patches/patch-lib_Xm_XpmI_h +++ b/x11/openmotif/patches/patch-lib_Xm_XpmI_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_Xm_XpmI_h,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/XpmI.h.orig Wed Sep 1 01:25:27 2004 -+++ lib/Xm/XpmI.h Wed Sep 1 01:31:33 2004 -@@ -179,6 +179,18 @@ extern FILE *popen(); +$OpenBSD: patch-lib_Xm_XpmI_h,v 1.2 2007/07/18 21:41:05 mbalmer Exp $ +--- lib/Xm/XpmI.h.orig Mon Dec 5 17:31:46 2005 ++++ lib/Xm/XpmI.h Sat Jun 30 10:35:25 2007 +@@ -182,6 +182,18 @@ extern FILE *popen(); boundCheckingCalloc((long)(nelem),(long) (elsize)) #endif @@ -20,16 +20,3 @@ $OpenBSD: patch-lib_Xm_XpmI_h,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ #define XPMMAXCMTLEN BUFSIZ typedef struct { unsigned int type; -@@ -276,9 +288,9 @@ typedef struct _xpmHashAtom { - } *xpmHashAtom; - - typedef struct { -- int size; -- int limit; -- int used; -+ unsigned int size; -+ unsigned int limit; -+ unsigned int used; - xpmHashAtom *atomTable; - } xpmHashTable; - diff --git a/x11/openmotif/patches/patch-lib_Xm_XpmWrFFrI_c b/x11/openmotif/patches/patch-lib_Xm_XpmWrFFrI_c deleted file mode 100644 index 5695cb1cada..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_XpmWrFFrI_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Xm_XpmWrFFrI_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/XpmWrFFrI.c.orig Fri Apr 28 09:05:22 2000 -+++ lib/Xm/XpmWrFFrI.c Wed Sep 1 01:31:33 2004 -@@ -239,6 +239,8 @@ WritePixels(file, width, height, cpp, pi - unsigned int x, y, h; - - h = height - 1; -+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-lib_Xm_Xpmcreate_c b/x11/openmotif/patches/patch-lib_Xm_Xpmcreate_c index ee360a11de0..8b9c027e7ec 100644 --- a/x11/openmotif/patches/patch-lib_Xm_Xpmcreate_c +++ b/x11/openmotif/patches/patch-lib_Xm_Xpmcreate_c @@ -1,15 +1,15 @@ -$OpenBSD: patch-lib_Xm_Xpmcreate_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/Xpmcreate.c.orig Fri Apr 28 09:05:21 2000 -+++ lib/Xm/Xpmcreate.c Wed Sep 1 01:39:33 2004 +$OpenBSD: patch-lib_Xm_Xpmcreate_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $ +--- lib/Xm/Xpmcreate.c.orig Tue Dec 6 18:31:15 2005 ++++ lib/Xm/Xpmcreate.c Sat Jun 30 10:39:31 2007 @@ -1,4 +1,5 @@ /* $XConsortium: Xpmcreate.c /main/8 1996/09/20 08:15:02 pascale $ */ +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ /* * Copyright (C) 1989-95 GROUPE BULL * -@@ -799,6 +800,9 @@ XpmCreateImageFromXpmImage(display, imag - - ErrorStatus = XpmSuccess; +@@ -809,6 +810,9 @@ XpmCreateImageFromXpmImage(display, image, + if (image->ncolors >= UINT_MAX / sizeof(Pixel)) + return (XpmNoMemory); + if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) + return (XpmNoMemory); @@ -17,28 +17,9 @@ $OpenBSD: patch-lib_Xm_Xpmcreate_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ /* malloc pixels index tables */ image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); if (!image_pixels) -@@ -942,6 +946,8 @@ CreateXImage(display, visual, depth, for - return (XpmNoMemory); - - #ifndef FOR_MSW -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ return XpmNoMemory; - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -1987,6 +1993,9 @@ xpmParseDataAndCreate(display, data, ima - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -+ if (ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return XpmNoMemory; -+ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2200,6 +2209,9 @@ ParseAndPutPixels(dc, data, width, heigh - { - unsigned short colidx[256]; +@@ -2254,6 +2258,9 @@ ParseAndPutPixels(dc, data, width, height, ncolors, cp + if (ncolors > 256) + return (XpmFileInvalid); + if (ncolors > 256) + return (XpmFileInvalid); @@ -46,7 +27,7 @@ $OpenBSD: patch-lib_Xm_Xpmcreate_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -2297,6 +2309,9 @@ if (cidx[f]) XpmFree(cidx[f]);} +@@ -2351,6 +2358,9 @@ if (cidx[f]) XpmFree(cidx[f]);} { char *s; char buf[BUFSIZ]; @@ -54,5 +35,5 @@ $OpenBSD: patch-lib_Xm_Xpmcreate_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ + if (cpp >= sizeof(buf)) + return (XpmFileInvalid); - buf[cpp] = '\0'; - if (USE_HASHTABLE) { + if (cpp >= sizeof(buf)) + return (XpmFileInvalid); diff --git a/x11/openmotif/patches/patch-lib_Xm_Xpmdata_c b/x11/openmotif/patches/patch-lib_Xm_Xpmdata_c deleted file mode 100644 index 73dd4c8f75e..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_Xpmdata_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Xm_Xpmdata_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/Xpmdata.c.orig Fri Apr 28 09:05:21 2000 -+++ lib/Xm/Xpmdata.c Wed Sep 1 01:37:36 2004 -@@ -371,7 +371,7 @@ xpmGetCmt(mdata, cmt) - { - if (!mdata->type) - *cmt = NULL; -- else if (mdata->CommentLength) { -+ else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(mdata->CommentLength + 1); - strncpy(*cmt, mdata->Comment, mdata->CommentLength); - (*cmt)[mdata->CommentLength] = '\0'; diff --git a/x11/openmotif/patches/patch-lib_Xm_Xpmhashtab_c b/x11/openmotif/patches/patch-lib_Xm_Xpmhashtab_c deleted file mode 100644 index 010b1a5ae36..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_Xpmhashtab_c +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-lib_Xm_Xpmhashtab_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/Xpmhashtab.c.orig Fri Apr 28 09:05:22 2000 -+++ lib/Xm/Xpmhashtab.c Wed Sep 1 01:31:33 2004 -@@ -136,7 +136,7 @@ HashTableGrows(table) - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; - int oldSize = size; -@@ -145,6 +145,8 @@ HashTableGrows(table) - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -+ if (size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -@@ -205,6 +207,8 @@ xpmHashTableInit(table) - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -+ if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-lib_Xm_Xpmparse_c b/x11/openmotif/patches/patch-lib_Xm_Xpmparse_c index 745660a39a1..09a962365a6 100644 --- a/x11/openmotif/patches/patch-lib_Xm_Xpmparse_c +++ b/x11/openmotif/patches/patch-lib_Xm_Xpmparse_c @@ -1,157 +1,24 @@ -$OpenBSD: patch-lib_Xm_Xpmparse_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/Xpmparse.c.orig Fri Apr 28 09:05:21 2000 -+++ lib/Xm/Xpmparse.c Wed Sep 1 01:38:34 2004 +$OpenBSD: patch-lib_Xm_Xpmparse_c,v 1.2 2007/07/18 21:41:06 mbalmer Exp $ +--- lib/Xm/Xpmparse.c.orig Mon Dec 5 17:31:46 2005 ++++ lib/Xm/Xpmparse.c Sat Jun 30 10:50:09 2007 @@ -1,4 +1,5 @@ /* $XConsortium: Xpmparse.c /main/6 1996/09/20 08:15:49 pascale $ */ +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ /* * Copyright (C) 1989-95 GROUPE BULL * -@@ -42,6 +43,24 @@ +@@ -49,7 +50,7 @@ #include "XpmI.h" #include - -+#ifdef HAS_STRLCAT -+# define STRLCAT(dst, src, dstsize) { \ -+ if (strlcat(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+#else -+# define STRLCAT(dst, src, dstsize) { \ -+ if ((strlen(dst) + strlen(src)) < (dstsize)) \ -+ strcat(dst, src); \ -+ else return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlen(src) < (dstsize)) \ -+ strcpy(dst, src); \ -+ else return (XpmFileInvalid); } -+#endif + #include +- + - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, - unsigned int cpp, XpmColor *colorTable, -@@ -318,7 +337,7 @@ xpmParseColors(data, ncolors, cpp, color - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key, l, a, b; -+ unsigned int key, l, a, b, len; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ - char buf[BUFSIZ]; -@@ -329,6 +348,8 @@ xpmParseColors(data, ncolors, cpp, color - char **defaults; - int ErrorStatus; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -340,6 +361,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -377,13 +402,14 @@ xpmParseColors(data, ncolors, cpp, color - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -394,9 +420,9 @@ xpmParseColors(data, ncolors, cpp, color - return (XpmFileInvalid); - } - if (!lastwaskey) -- strcat(curbuf, " "); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf);/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ - lastwaskey = 0; - } + #ifdef HAS_STRLCAT + # define STRLCAT(dst, src, dstsize) do { \ + if (strlcat(dst, src, dstsize) >= (dstsize)) \ +@@ -555,6 +556,9 @@ ParsePixels(data, width, height, ncolors, cpp, colorTa + return (XpmFileInvalid); } -@@ -404,12 +430,13 @@ xpmParseColors(data, ncolors, cpp, color - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -422,6 +449,10 @@ xpmParseColors(data, ncolors, cpp, color - /* - * read pixel value - */ -+ if (cpp >= SIZE_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -450,16 +481,17 @@ xpmParseColors(data, ncolors, cpp, color - *curbuf = '\0'; /* init curbuf */ - while (l = xpmNextWord(data, buf, BUFSIZ)) { - if (*curbuf != '\0') -- strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - } -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -484,6 +516,9 @@ ParsePixels(data, width, height, ncolors - unsigned int *iptr, *iptr2; - unsigned int a, x, y; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); - #else -@@ -507,6 +542,9 @@ ParsePixels(data, width, height, ncolors - { - unsigned short colidx[256]; + if (ncolors > 256) + return (XpmFileInvalid); @@ -159,7 +26,7 @@ $OpenBSD: patch-lib_Xm_Xpmparse_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -583,6 +621,9 @@ if (cidx[f]) XpmFree(cidx[f]);} +@@ -635,6 +639,9 @@ do \ { char *s; char buf[BUFSIZ]; @@ -167,5 +34,5 @@ $OpenBSD: patch-lib_Xm_Xpmparse_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ + if (cpp >= sizeof(buf)) + return (XpmFileInvalid); - buf[cpp] = '\0'; - if (USE_HASHTABLE) { + if (cpp >= sizeof(buf)) { + XpmFree(iptr2); /* found by Egbert Eich */ diff --git a/x11/openmotif/patches/patch-lib_Xm_Xpmscan_c b/x11/openmotif/patches/patch-lib_Xm_Xpmscan_c deleted file mode 100644 index 522ea272485..00000000000 --- a/x11/openmotif/patches/patch-lib_Xm_Xpmscan_c +++ /dev/null @@ -1,68 +0,0 @@ -$OpenBSD: patch-lib_Xm_Xpmscan_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $ ---- lib/Xm/Xpmscan.c.orig Fri Apr 28 09:05:21 2000 -+++ lib/Xm/Xpmscan.c Wed Sep 1 01:31:33 2004 -@@ -93,7 +93,8 @@ LFUNC(MSWGetImagePixels, int, (Display * - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -+ unsigned int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -220,11 +221,17 @@ XpmCreateXpmImageFromImage(display, imag - else - cpp = 0; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -+ if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -279,7 +286,8 @@ XpmCreateXpmImageFromImage(display, imag - * get rgb values and a string of char, and possibly a name for each - * color - */ -- -+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) - RETURN(XpmNoMemory); -@@ -327,6 +335,8 @@ ScanTransparentColor(color, cpp, attribu - - /* first get a character string */ - a = 0; -+ if (cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); - *s++ = printable[c = a % MAXPRINTABLE]; -@@ -374,7 +384,7 @@ static int - ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) - Display *display; - XpmColor *colors; -- int ncolors; -+ unsigned int ncolors; - Pixel *pixels; - unsigned int mask; - unsigned int cpp; -@@ -418,6 +428,8 @@ ScanOtherColors(display, colors, ncolors - } - - /* first get character strings and rgb values */ -+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); diff --git a/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c b/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c deleted file mode 100644 index c3b91adae56..00000000000 --- a/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/Performance/Startup/editor.c.orig Wed May 3 02:12:48 2000 -+++ tests/Performance/Startup/editor.c Mon Nov 20 19:08:40 2000 -@@ -238,7 +238,7 @@ - - strcpy(tempname, "/tmp/xmeditXXXXXX"); - -- if ((tfp = fopen(mktemp(tempname), "w")) == NULL) { -+ if ((tfp = mkstemp(tempname)) == NULL) { - fprintf(stderr, "Warning: unable to open temp file, text not saved.\n"); - return(False);; - } diff --git a/x11/openmotif/patches/patch-tools_wml_Makefile_in b/x11/openmotif/patches/patch-tools_wml_Makefile_in new file mode 100644 index 00000000000..14a1601967a --- /dev/null +++ b/x11/openmotif/patches/patch-tools_wml_Makefile_in @@ -0,0 +1,27 @@ +$OpenBSD: patch-tools_wml_Makefile_in,v 1.1 2007/07/18 21:41:06 mbalmer Exp $ +--- tools/wml/Makefile.in.orig Sat Jun 30 12:10:22 2007 ++++ tools/wml/Makefile.in Sat Jun 30 12:11:09 2007 +@@ -15,7 +15,7 @@ + @SET_MAKE@ + + +- ++RM=rm + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -631,11 +631,11 @@ UilLexPars.c: Uil.c + $(LN_S) Uil.c UilLexPars.c + + $(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE) +- $(RM) $(WMLTARGETS) wml.report wml-uil.mm ++ -$(RM) $(WMLTARGETS) wml.report wml-uil.mm + ./wmluiltok <$(srcdir)/Uil.y >tokens.dat +- $(RM) wml-uil.mm ++ -$(RM) wml-uil.mm + ./wml $(srcdir)/$(TABLE) +- $(RM) tokens.dat ++ -$(RM) tokens.dat + + all: motif.wmd + diff --git a/x11/openmotif/pkg/DESCR-debuglibs b/x11/openmotif/pkg/DESCR-debuglibs deleted file mode 100644 index 3ad137facb4..00000000000 --- a/x11/openmotif/pkg/DESCR-debuglibs +++ /dev/null @@ -1,16 +0,0 @@ -Here is what you might ask. (excerpted from The Open Group FAQ) - - Q: What is Open Motif? How does it differ from standard Motif? - - A: Aside from some different copyright and license statements, both - Motif and Open Motif share the same functionality and source code. - The primary difference is the software license for each of the - software products. Open Motif source code and binaries can be - distributed royalty free under The Open Group Public License as - long as the operating system upon which Open Motif is running meets - the OSI's Open Source Definition. Motif is made available under - the standard Open Group software licenses and requires the payment - of source code and royalty fees. - -This package add debug version of libXm, libMrm and libUil that -can be used for development purpose. diff --git a/x11/openmotif/pkg/DESCR-demos b/x11/openmotif/pkg/DESCR-demos index afd4ef26ba0..1e781e8b313 100644 --- a/x11/openmotif/pkg/DESCR-demos +++ b/x11/openmotif/pkg/DESCR-demos @@ -1,16 +1,2 @@ -Here is what you might ask. (excerpted from The Open Group FAQ) - - Q: What is Open Motif? How does it differ from standard Motif? - - A: Aside from some different copyright and license statements, both - Motif and Open Motif share the same functionality and source code. - The primary difference is the software license for each of the - software products. Open Motif source code and binaries can be - distributed royalty free under The Open Group Public License as - long as the operating system upon which Open Motif is running meets - the OSI's Open Source Definition. Motif is made available under - the standard Open Group software licenses and requires the payment - of source code and royalty fees. - This package add executable binaries that demonstrate the capability of Motif toolkit. diff --git a/x11/openmotif/pkg/PLIST-debuglibs b/x11/openmotif/pkg/PLIST-debuglibs deleted file mode 100644 index aebcfb1d705..00000000000 --- a/x11/openmotif/pkg/PLIST-debuglibs +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PLIST-debuglibs,v 1.2 2004/09/15 19:26:30 espie Exp $ -lib/libMrm_d.a -lib/libUil_d.a -lib/libXm_d.a diff --git a/x11/openmotif/pkg/PLIST-demos b/x11/openmotif/pkg/PLIST-demos index 3818f41dd45..6857a837754 100644 --- a/x11/openmotif/pkg/PLIST-demos +++ b/x11/openmotif/pkg/PLIST-demos @@ -1,118 +1,314 @@ -@comment $OpenBSD: PLIST-demos,v 1.3 2004/09/15 19:26:30 espie Exp $ +@comment $OpenBSD: PLIST-demos,v 1.4 2007/07/18 21:41:06 mbalmer Exp $ bin/DNDDemo -bin/UTMXmText -bin/aicon bin/airport bin/autopopups -bin/combo_box -bin/container -bin/dainput -bin/dogs +bin/bboxdemo +bin/colordemo +bin/column +bin/combo bin/draw bin/earth -bin/exm_in_c -bin/exm_in_uil +bin/ext18list bin/filemanager bin/fileview +bin/fontsel bin/getsubres bin/helloint bin/hellomotif bin/i18ninput -bin/motifshell -bin/notebook -bin/onHelp +bin/iconbuttondemo +bin/outline +bin/paned +bin/panner bin/periodic bin/piano bin/sampler2_0 bin/setDate -bin/simpleDemo -bin/simple_drag -bin/simple_drop bin/simpledrop -bin/spin_box -bin/tic_mark -bin/uilsymdump +bin/tabstack +bin/todo +bin/tooltips +bin/tree +bin/wsm bin/xmanimate -bin/xmapdef -bin/xmfonts -bin/xmforc -bin/xmform -lib/X11/app-defaults/Fileview -lib/X11/app-defaults/XmdAirport -lib/X11/app-defaults/XmdAnimate -lib/X11/app-defaults/XmdDraw -lib/X11/app-defaults/XmdFilemanager -lib/X11/app-defaults/XmdI18nInput -lib/X11/app-defaults/XmdPeriodic -lib/X11/app-defaults/XmdSampler2_0 -lib/X11/app-defaults/XmdSetDate -lib/X11/help/ -lib/X11/help/aicon.help -lib/X11/help/draw.help -lib/X11/help/filemanager.help -lib/X11/help/getsubres.help -lib/X11/help/helpOn.help -lib/X11/help/i18ninput.help -lib/X11/help/sampler2_0.help -lib/X11/help/xmanimate.help -lib/X11/motifshell/ -lib/X11/motifshell/help -lib/X11/motifshell/membership -lib/X11/motifshell/motif -lib/X11/motifshell/motifshell.c -lib/X11/motifshell/principles -lib/X11/motifshell/research -lib/X11/motifshell/welcome -lib/X11/uid/ -lib/X11/uid/C/ -lib/X11/uid/C/uid/ -lib/X11/uid/C/uid/l_strings.uid -lib/X11/uid/English.uid -lib/X11/uid/French.uid -lib/X11/uid/German.uid -lib/X11/uid/dog.uid -lib/X11/uid/dogs.uid -lib/X11/uid/english/ -lib/X11/uid/english/uid/ -lib/X11/uid/english/uid/l_strings.uid -lib/X11/uid/exm_in_uil.uid -lib/X11/uid/french/ -lib/X11/uid/french/uid/ -lib/X11/uid/french/uid/l_strings.uid -lib/X11/uid/hebrew/ -lib/X11/uid/hebrew/uid/ -lib/X11/uid/hebrew/uid/l_strings.uid -lib/X11/uid/helloint.uid -lib/X11/uid/hellomotif.uid -lib/X11/uid/japanese/ -lib/X11/uid/japanese/uid/ -lib/X11/uid/japanese/uid/l_strings.uid -lib/X11/uid/periodic.uid -lib/X11/uid/plane.uid -lib/X11/uid/superman.uid -lib/X11/uid/swedish/ -lib/X11/uid/swedish/uid/ -lib/X11/uid/swedish/uid/l_strings.uid -lib/X11/uid/xmanimate.uid -@man man/man1/DNDDemo.1 -@man man/man1/autopopups.1 -@man man/man1/combo_box.1 -@man man/man1/container.1 -@man man/man1/draw.1 -@man man/man1/earth.1 -@man man/man1/exm_in_c.1 -@man man/man1/exm_in_uil.1 -@man man/man1/filemanager.1 -@man man/man1/getsubres.1 -@man man/man1/helloint.1 -@man man/man1/i18ninput.1 -@man man/man1/notebook.1 -@man man/man1/periodic.1 -@man man/man1/piano.1 -@man man/man1/sampler2_0.1 -@man man/man1/setDate.1 -@man man/man1/simpleDemo.1 -@man man/man1/simpledrop.1 -@man man/man1/spin_box.1 -@man man/man1/tic_mark.1 -@man man/man1/xmanimate.1 +man/manm/ +man/manm/exm_in_c.man +man/manm/simpleDemo.man +share/Xm/ +share/Xm/ButtonBox/ +share/Xm/ButtonBox/Imakefile +share/Xm/ButtonBox/bboxdemo.c +share/Xm/Color/ +share/Xm/Color/Imakefile +share/Xm/Color/colordemo.c +share/Xm/Color/util-c.c +share/Xm/Column/ +share/Xm/Column/Column.ad +share/Xm/Column/Imakefile +share/Xm/Column/column.c +share/Xm/Exm/ +share/Xm/Exm/app_in_c/ +share/Xm/Exm/app_in_c/exm_in_c +share/Xm/Exm/simple_app/ +share/Xm/Exm/simple_app/README +share/Xm/Exm/simple_app/simpleDemo +share/Xm/Ext18list/ +share/Xm/Ext18list/Imakefile +share/Xm/Ext18list/callbacks-c.c +share/Xm/Ext18list/creation.c +share/Xm/Ext18list/ext18list.c +share/Xm/Ext18list/extlist.h +share/Xm/Ext18list/pixmaps/ +share/Xm/Ext18list/pixmaps/clown.xbm +share/Xm/Ext18list/pixmaps/crab.xpm +share/Xm/Ext18list/pixmaps/eye.xpm +share/Xm/Ext18list/pixmaps/porsche.xpm +share/Xm/Ext18list/pixmaps/stopsign.xpm +share/Xm/Ext18list/util-c.c +share/Xm/Icon/ +share/Xm/Icon/Imakefile +share/Xm/Icon/iconbuttondemo.c +share/Xm/Icon/misc.c +share/Xm/Icon/small.bm +share/Xm/Outline/ +share/Xm/Outline/Imakefile +share/Xm/Outline/outline.c +share/Xm/Paned2/ +share/Xm/Paned2/Imakefile +share/Xm/Paned2/creation-c.c +share/Xm/Paned2/paned.c +share/Xm/Tabstack/ +share/Xm/Tabstack/Imakefile +share/Xm/Tabstack/bxutils.c +share/Xm/Tabstack/callbacks.c +share/Xm/Tabstack/creation.c +share/Xm/Tabstack/creation.h +share/Xm/Tabstack/main.c +share/Xm/Tree/ +share/Xm/Tree/Imakefile +share/Xm/Tree/bxutil-c.c +share/Xm/Tree/tree.c +share/Xm/airport/ +share/Xm/airport/Imakefile +share/Xm/airport/README +share/Xm/airport/XmdAirport.ad +share/Xm/airport/airport.h +share/Xm/airport/dragsource.c +share/Xm/airport/dragsource.h +share/Xm/airport/dropsite.c +share/Xm/airport/dropsite.h +share/Xm/airport/main.c +share/Xm/airport/main.h +share/Xm/animate/ +share/Xm/animate/Imakefile +share/Xm/animate/README +share/Xm/animate/XmdAnimate.ad +share/Xm/animate/animate.help +share/Xm/animate/animate.man +share/Xm/animate/dog.uid +share/Xm/animate/dog.uil +share/Xm/animate/plane.uid +share/Xm/animate/plane.uil +share/Xm/animate/superman.uid +share/Xm/animate/superman.uil +share/Xm/animate/superman1.xbm +share/Xm/animate/superman2.xbm +share/Xm/animate/superman3.xbm +share/Xm/animate/superman4.xbm +share/Xm/animate/superman5.xbm +share/Xm/animate/superman6.xbm +share/Xm/animate/xmanimate.c +share/Xm/animate/xmanimate.man +share/Xm/animate/xmanimate.uid +share/Xm/animate/xmanimate.uil +share/Xm/autopopups/ +share/Xm/autopopups/Imakefile +share/Xm/autopopups/README +share/Xm/autopopups/autopopups.c +share/Xm/autopopups/autopopups.man +share/Xm/combo2/ +share/Xm/combo2/Combo.ad +share/Xm/combo2/Imakefile +share/Xm/combo2/combo.c +share/Xm/draw/ +share/Xm/draw/Imakefile +share/Xm/draw/README +share/Xm/draw/XmdDraw.ad +share/Xm/draw/draw.c +share/Xm/draw/draw.help +share/Xm/draw/draw.man +share/Xm/earth/ +share/Xm/earth/Imakefile +share/Xm/earth/README +share/Xm/earth/earth.c +share/Xm/earth/earth.man +share/Xm/earth/terre.xbm +share/Xm/filemanager/ +share/Xm/filemanager/Imakefile +share/Xm/filemanager/XmdFilemanager.ad +share/Xm/filemanager/actions.c +share/Xm/filemanager/code.xpm +share/Xm/filemanager/convert.c +share/Xm/filemanager/dir.xpm +share/Xm/filemanager/exec.xpm +share/Xm/filemanager/file.xpm +share/Xm/filemanager/filemanager.c +share/Xm/filemanager/filemanager.h +share/Xm/filemanager/filemanager.help +share/Xm/filemanager/filemanager.man +share/Xm/filemanager/interface.c +share/Xm/filemanager/none.xpm +share/Xm/filemanager/obj.xpm +share/Xm/filemanager/pix.xpm +share/Xm/filemanager/readdir.c +share/Xm/filemanager/s_dir.xpm +share/Xm/filemanager/s_exec.xpm +share/Xm/filemanager/s_file.xpm +share/Xm/filemanager/s_none.xpm +share/Xm/filemanager/s_pix.xpm +share/Xm/fileview/ +share/Xm/fileview/English.df +share/Xm/fileview/English.uid +share/Xm/fileview/English.uil +share/Xm/fileview/Fileview.ad +share/Xm/fileview/French.df +share/Xm/fileview/French.uid +share/Xm/fileview/French.uil +share/Xm/fileview/German.df +share/Xm/fileview/German.uid +share/Xm/fileview/German.uil +share/Xm/fileview/README +share/Xm/fileview/file.c +share/Xm/fileview/file.h +share/Xm/fileview/fileE.h +share/Xm/fileview/fileview.h +share/Xm/fileview/main.c +share/Xm/fileview/main.h +share/Xm/fileview/mainE.h +share/Xm/fileview/text.c +share/Xm/fileview/text.h +share/Xm/fileview/textE.h +share/Xm/fontsel/ +share/Xm/fontsel/Imakefile +share/Xm/fontsel/callbacks-c.c +share/Xm/fontsel/creation-c.c +share/Xm/fontsel/fontsel.c +share/Xm/fontsel/fontsel.h +share/Xm/getsubres/ +share/Xm/getsubres/Imakefile +share/Xm/getsubres/README +share/Xm/getsubres/getsubres.c +share/Xm/getsubres/getsubres.help +share/Xm/getsubres/getsubres.man +share/Xm/helloint/ +share/Xm/helloint/Imakefile +share/Xm/helloint/README +share/Xm/helloint/helloint.c +share/Xm/helloint/helloint.man +share/Xm/helloint/helloint.uid +share/Xm/helloint/helloint.uil +share/Xm/hellomotif/ +share/Xm/hellomotif/Imakefile +share/Xm/hellomotif/README +share/Xm/hellomotif/hellomotif.c +share/Xm/hellomotif/hellomotif.uid +share/Xm/hellomotif/hellomotif.uil +share/Xm/i18ninput/ +share/Xm/i18ninput/Imakefile +share/Xm/i18ninput/README +share/Xm/i18ninput/XmdI18nInput.ad +share/Xm/i18ninput/i18ninput.c +share/Xm/i18ninput/i18ninput.help +share/Xm/i18ninput/i18ninput.man +share/Xm/i18ninput/input.c +share/Xm/panner/ +share/Xm/panner/Imakefile +share/Xm/panner/README +share/Xm/panner/panner.c +share/Xm/panner/panner.man +share/Xm/periodic/ +share/Xm/periodic/Imakefile +share/Xm/periodic/README +share/Xm/periodic/XmdPeriodic.ad +share/Xm/periodic/periodic.c +share/Xm/periodic/periodic.uid +share/Xm/periodic/periodic.uil +share/Xm/periodic/periodic_l.uil +share/Xm/piano/ +share/Xm/piano/Imakefile +share/Xm/piano/Inv8_part1.piano +share/Xm/piano/Inv8_part2.piano +share/Xm/piano/README +share/Xm/piano/piano.c +share/Xm/piano/piano.images +share/Xm/piano/piano.man +share/Xm/pixmaps/ +share/Xm/pixmaps/clown.xbm +share/Xm/pixmaps/crab.xpm +share/Xm/pixmaps/eye.xpm +share/Xm/pixmaps/porsche.xpm +share/Xm/pixmaps/stopsign.xpm +share/Xm/sampler2_0/ +share/Xm/sampler2_0/Imakefile +share/Xm/sampler2_0/README +share/Xm/sampler2_0/XmdSampler2_0.ad +share/Xm/sampler2_0/bee.xpm +share/Xm/sampler2_0/bomb.xpm +share/Xm/sampler2_0/cherry.xpm +share/Xm/sampler2_0/da.xpm +share/Xm/sampler2_0/girlface.xpm +share/Xm/sampler2_0/k7.xpm +share/Xm/sampler2_0/labir.xpm +share/Xm/sampler2_0/main.xpm +share/Xm/sampler2_0/pile.xpm +share/Xm/sampler2_0/prev.xpm +share/Xm/sampler2_0/sampler2_0.c +share/Xm/sampler2_0/sampler2_0.help +share/Xm/sampler2_0/sampler2_0.man +share/Xm/sampler2_0/spir.xpm +share/Xm/sampler2_0/stack.xpm +share/Xm/sampler2_0/text.xpm +share/Xm/setDate/ +share/Xm/setDate/Imakefile +share/Xm/setDate/README +share/Xm/setDate/XmdSetDate.ad +share/Xm/setDate/setDate.c +share/Xm/setDate/setDate.man +share/Xm/todo/ +share/Xm/todo/Imakefile +share/Xm/todo/README +share/Xm/todo/XmdTodo.ad +share/Xm/todo/actions.c +share/Xm/todo/example.todo +share/Xm/todo/io.c +share/Xm/todo/page.h +share/Xm/todo/todo.c +share/Xm/todo/todo.help +share/Xm/todo/todo.man +share/Xm/tooltips/ +share/Xm/tooltips/Imakefile +share/Xm/tooltips/tooltips.c +share/Xm/wsm/ +share/Xm/wsm/Imakefile +share/Xm/wsm/README +share/Xm/wsm/client_win.c +share/Xm/wsm/command_ui.c +share/Xm/wsm/command_ui.h +share/Xm/wsm/wsm.c +share/Xm/wsm/wsm.h +share/Xm/wsm/wsm.man +share/Xm/wsm/wsmData.c +share/Xm/wsm/wsmData.h +share/Xm/wsm/wsmDebug.c +share/Xm/wsm/wsmDebug.h +share/Xm/wsm/wsmSend.c +share/Xm/wsm/wsmSend.h +share/Xm/wsm/wsmStruct.c +share/Xm/wsm/wsmStruct.h +share/Xm/wsm/wsm_cb.c +share/Xm/wsm/wsm_cb.h +share/Xm/wsm/wsm_create.c +share/Xm/wsm/wsm_create.h +share/Xm/wsm/wsm_ui.h +share/Xm/wsm/xrmLib.c +share/Xm/wsm/xrmLib.h diff --git a/x11/openmotif/pkg/PLIST-main b/x11/openmotif/pkg/PLIST-main index 7c4c801b224..f6cf071958e 100644 --- a/x11/openmotif/pkg/PLIST-main +++ b/x11/openmotif/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/23 23:30:06 kili Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2007/07/18 21:41:06 mbalmer Exp $ @conflict lesstif-* @pkgpath x11/openmotif bin/mwm @@ -35,6 +35,8 @@ include/Xm/AtomMgr.h include/Xm/BaseClassP.h include/Xm/BulletinB.h include/Xm/BulletinBP.h +include/Xm/ButtonBox.h +include/Xm/ButtonBoxP.h include/Xm/CacheP.h include/Xm/CareVisualT.h include/Xm/CascadeB.h @@ -44,7 +46,13 @@ include/Xm/CascadeBP.h include/Xm/ClipWindowP.h include/Xm/ColorObjP.h include/Xm/ColorP.h +include/Xm/ColorS.h +include/Xm/ColorSP.h +include/Xm/Column.h +include/Xm/ColumnP.h include/Xm/ComboBox.h +include/Xm/ComboBox2.h +include/Xm/ComboBox2P.h include/Xm/ComboBoxP.h include/Xm/Command.h include/Xm/CommandP.h @@ -53,6 +61,9 @@ include/Xm/Container.h include/Xm/ContainerP.h include/Xm/ContainerT.h include/Xm/CutPaste.h +include/Xm/DataF.h +include/Xm/DataFP.h +include/Xm/DataFSelP.h include/Xm/DesktopP.h include/Xm/DialogS.h include/Xm/DialogSEP.h @@ -68,17 +79,26 @@ include/Xm/DragIconP.h include/Xm/DragOverS.h include/Xm/DragOverSP.h include/Xm/DrawP.h +include/Xm/DrawUtils.h include/Xm/DrawingA.h include/Xm/DrawingAP.h include/Xm/DrawnB.h include/Xm/DrawnBP.h +include/Xm/DropDown.h +include/Xm/DropDownP.h include/Xm/DropSMgr.h include/Xm/DropSMgrP.h include/Xm/DropTrans.h include/Xm/DropTransP.h +include/Xm/Ext.h +include/Xm/Ext18List.h +include/Xm/Ext18ListP.h include/Xm/ExtObjectP.h +include/Xm/ExtP.h include/Xm/FileSB.h include/Xm/FileSBP.h +include/Xm/FontS.h +include/Xm/FontSP.h include/Xm/Form.h include/Xm/FormP.h include/Xm/Frame.h @@ -87,6 +107,12 @@ include/Xm/Gadget.h include/Xm/GadgetP.h include/Xm/GrabShell.h include/Xm/GrabShellP.h +include/Xm/Hierarchy.h +include/Xm/HierarchyP.h +include/Xm/IconBox.h +include/Xm/IconBoxP.h +include/Xm/IconButton.h +include/Xm/IconButtonP.h include/Xm/IconFile.h include/Xm/IconFileP.h include/Xm/IconG.h @@ -113,13 +139,25 @@ include/Xm/MenuT.h include/Xm/MenuUtilP.h include/Xm/MessageB.h include/Xm/MessageBP.h +include/Xm/MultiList.h +include/Xm/MultiListP.h include/Xm/MwmUtil.h include/Xm/NavigatorT.h include/Xm/Notebook.h include/Xm/NotebookP.h +include/Xm/Outline.h +include/Xm/OutlineP.h +include/Xm/Paned.h +include/Xm/PanedP.h include/Xm/PanedW.h include/Xm/PanedWP.h +include/Xm/Panner.h +include/Xm/PannerP.h +include/Xm/Picture.h +include/Xm/PictureP.h include/Xm/PointInT.h +include/Xm/Porthole.h +include/Xm/PortholeP.h include/Xm/Primitive.h include/Xm/PrimitiveP.h include/Xm/Print.h @@ -154,9 +192,20 @@ include/Xm/SeparatoGP.h include/Xm/Separator.h include/Xm/SeparatorP.h include/Xm/ShellEP.h +include/Xm/SlideC.h +include/Xm/SlideCP.h include/Xm/SpecRenderT.h include/Xm/SpinB.h include/Xm/SpinBP.h +include/Xm/Stretch.h +include/Xm/StretchP.h +include/Xm/TabBox.h +include/Xm/TabBoxP.h +include/Xm/TabList.h +include/Xm/TabStack.h +include/Xm/TabStackP.h +include/Xm/TableLayout.h +include/Xm/TableLayoutP.h include/Xm/TakesDefT.h include/Xm/TearOffBP.h include/Xm/TearOffP.h @@ -173,12 +222,18 @@ include/Xm/ToggleB.h include/Xm/ToggleBG.h include/Xm/ToggleBGP.h include/Xm/ToggleBP.h +include/Xm/ToolTipCT.h +include/Xm/ToolTipT.h +include/Xm/Toolbar.h +include/Xm/ToolbarP.h include/Xm/TraitP.h include/Xm/Transfer.h include/Xm/TransferP.h include/Xm/TransferT.h include/Xm/TransltnsP.h include/Xm/TravConT.h +include/Xm/Tree.h +include/Xm/TreeP.h include/Xm/TxtPropCv.h include/Xm/UnhighlightT.h include/Xm/UnitTypeT.h @@ -193,9 +248,15 @@ include/Xm/XmAll.h include/Xm/XmIm.h include/Xm/XmP.h include/Xm/XmStrDefs.h +include/Xm/XmStrDefs22.h +include/Xm/XmStrDefs23.h include/Xm/Xmfuncs.h include/Xm/XmosP.h +include/Xm/Xmos_r.h +include/Xm/Xmpoll.h include/Xm/XpmP.h +include/Xm/xmlist.h +include/Xm/xsettings.h include/uil/ include/uil/Uil.h include/uil/UilDBDef.h @@ -203,10 +264,7 @@ include/uil/UilDef.h include/uil/UilSymDef.h include/uil/UilSymGl.h include/uil/XmAppl.uil -@unexec [ -f /usr/X11R6/lib/X11/config/Motif.rules.orig ] && mv -f /usr/X11R6/lib/X11/config/Motif.rules.orig /usr/X11R6/lib/X11/config/Motif.rules -lib/X11/app-defaults/Mwm lib/X11/bindings/ -lib/X11/bindings/CDE lib/X11/bindings/acorn lib/X11/bindings/apollo lib/X11/bindings/dec @@ -235,14 +293,16 @@ lib/X11/bindings/tek lib/X11/bindings/xmbind.alias lib/X11/config/ lib/X11/config/Motif.rules -@exec [ -f /usr/X11R6/lib/X11/config/Motif.rules ] && (mv -f /usr/X11R6/lib/X11/config/Motif.rules /usr/X11R6/lib/X11/config/Motif.rules.orig && cp -p %D/%F /usr/X11R6/lib/X11/config) -@unexec [ -f /usr/X11R6/lib/X11/config/Motif.tmpl.orig ] && mv -f /usr/X11R6/lib/X11/config/Motif.tmpl.orig /usr/X11R6/lib/X11/config/Motif.tmpl +@sample /usr/X11R6/lib/X11/config/Motif.rules lib/X11/config/Motif.tmpl -@exec [ -f /usr/X11R6/lib/X11/config/Motif.tmpl ] && (mv -f /usr/X11R6/lib/X11/config/Motif.tmpl /usr/X11R6/lib/X11/config/Motif.tmpl.orig && cp -p %D/%F /usr/X11R6/lib/X11/config) +@sample /usr/X11R6/lib/X11/config/Motif.tmpl lib/X11/system.mwmrc lib/libMrm.a +lib/libMrm.la lib/libUil.a +lib/libUil.la lib/libXm.a +lib/libXm.la @man man/man1/mwm.1 @man man/man1/uil.1 @man man/man1/xmbind.1 @@ -287,6 +347,7 @@ lib/libXm.a @man man/man3/XmArrowButton.3 @man man/man3/XmArrowButtonGadget.3 @man man/man3/XmBulletinBoard.3 +@man man/man3/XmButtonBox.3 @man man/man3/XmCascadeButton.3 @man man/man3/XmCascadeButtonGadget.3 @man man/man3/XmCascadeButtonGadgetHighlight.3 @@ -309,6 +370,8 @@ lib/libXm.a @man man/man3/XmClipboardUndoCopy.3 @man man/man3/XmClipboardUnlock.3 @man man/man3/XmClipboardWithdrawFormat.3 +@man man/man3/XmColorSelector.3 +@man man/man3/XmColumn.3 @man man/man3/XmComboBox.3 @man man/man3/XmComboBoxAddItem.3 @man man/man3/XmComboBoxDeletePos.3 @@ -335,8 +398,10 @@ lib/libXm.a @man man/man3/XmCreateArrowButtonGadget.3 @man man/man3/XmCreateBulletinBoard.3 @man man/man3/XmCreateBulletinBoardDialog.3 +@man man/man3/XmCreateButtonBox.3 @man man/man3/XmCreateCascadeButton.3 @man man/man3/XmCreateCascadeButtonGadget.3 +@man man/man3/XmCreateCombinationBox2.3 @man man/man3/XmCreateComboBox.3 @man man/man3/XmCreateCommand.3 @man man/man3/XmCreateCommandDialog.3 @@ -345,6 +410,7 @@ lib/libXm.a @man man/man3/XmCreateDragIcon.3 @man man/man3/XmCreateDrawingArea.3 @man man/man3/XmCreateDrawnButton.3 +@man man/man3/XmCreateDropDown.3 @man man/man3/XmCreateDropDownComboBox.3 @man man/man3/XmCreateDropDownList.3 @man man/man3/XmCreateErrorDialog.3 @@ -353,6 +419,7 @@ lib/libXm.a @man man/man3/XmCreateForm.3 @man man/man3/XmCreateFormDialog.3 @man man/man3/XmCreateFrame.3 +@man man/man3/XmCreateHierarchy.3 @man man/man3/XmCreateIconGadget.3 @man man/man3/XmCreateInformationDialog.3 @man man/man3/XmCreateLabel.3 @@ -365,6 +432,7 @@ lib/libXm.a @man man/man3/XmCreateMessageDialog.3 @man man/man3/XmCreateNotebook.3 @man man/man3/XmCreateOptionMenu.3 +@man man/man3/XmCreateOutline.3 @man man/man3/XmCreatePanedWindow.3 @man man/man3/XmCreatePopupMenu.3 @man man/man3/XmCreatePromptDialog.3 @@ -406,6 +474,21 @@ lib/libXm.a @man man/man3/XmCvtXmStringTableToTextProperty.3 @man man/man3/XmCvtXmStringToByteStream.3 @man man/man3/XmCvtXmStringToCT.3 +@man man/man3/XmDataField.3 +@man man/man3/XmDataFieldCopy.3 +@man man/man3/XmDataFieldCut.3 +@man man/man3/XmDataFieldGetSelection.3 +@man man/man3/XmDataFieldGetSelectionPosition.3 +@man man/man3/XmDataFieldGetString.3 +@man man/man3/XmDataFieldGetStringWcs.3 +@man man/man3/XmDataFieldPaste.3 +@man man/man3/XmDataFieldSetAddMode.3 +@man man/man3/XmDataFieldSetEditable.3 +@man man/man3/XmDataFieldSetHighlight.3 +@man man/man3/XmDataFieldSetInsertionPosition.3 +@man man/man3/XmDataFieldSetSelection.3 +@man man/man3/XmDataFieldSetString.3 +@man man/man3/XmDataFieldXYToPos.3 @man man/man3/XmDeactivateProtocol.3 @man man/man3/XmDeactivateWMProtocol.3 @man man/man3/XmDestroyPixmap.3 @@ -421,6 +504,8 @@ lib/libXm.a @man man/man3/XmDragStart.3 @man man/man3/XmDrawingArea.3 @man man/man3/XmDrawnButton.3 +@man man/man3/XmDropDown.3 +@man man/man3/XmDropDownGetChild.3 @man man/man3/XmDropSite.3 @man man/man3/XmDropSiteConfigureStackingOrder.3 @man man/man3/XmDropSiteEndUpdate.3 @@ -434,6 +519,7 @@ lib/libXm.a @man man/man3/XmDropTransfer.3 @man man/man3/XmDropTransferAdd.3 @man man/man3/XmDropTransferStart.3 +@man man/man3/XmExt18List.3 @man man/man3/XmFileSelectionBox.3 @man man/man3/XmFileSelectionBoxGetChild.3 @man man/man3/XmFileSelectionDoSearch.3 @@ -453,6 +539,7 @@ lib/libXm.a @man man/man3/XmFontListInitFontContext.3 @man man/man3/XmFontListNextEntry.3 @man man/man3/XmFontListRemoveEntry.3 +@man man/man3/XmFontSelector.3 @man man/man3/XmForm.3 @man man/man3/XmFrame.3 @man man/man3/XmGadget.3 @@ -473,6 +560,12 @@ lib/libXm.a @man man/man3/XmGetVisibility.3 @man man/man3/XmGetXmDisplay.3 @man man/man3/XmGetXmScreen.3 +@man man/man3/XmHierarchy.3 +@man man/man3/XmHierarchyGetChildNodes.3 +@man man/man3/XmHierarchyOpenAllAncestors.3 +@man man/man3/XmIconBox.3 +@man man/man3/XmIconBoxIsCellEmpty.3 +@man man/man3/XmIconButton.3 @man man/man3/XmIconGadget.3 @man man/man3/XmImCloseXIM.3 @man man/man3/XmImFreeXIC.3 @@ -542,11 +635,26 @@ lib/libXm.a @man man/man3/XmMenuShell.3 @man man/man3/XmMessageBox.3 @man man/man3/XmMessageBoxGetChild.3 +@man man/man3/XmMultiList.3 +@man man/man3/XmMultiListDeselectItems.3 +@man man/man3/XmMultiListDeselectRow.3 +@man man/man3/XmMultiListGetSelectedRowArray.3 +@man man/man3/XmMultiListGetSelectedRows.3 +@man man/man3/XmMultiListMakeRowVisible.3 +@man man/man3/XmMultiListSelectAllItems.3 +@man man/man3/XmMultiListSelectItems.3 +@man man/man3/XmMultiListSelectRow.3 +@man man/man3/XmMultiListToggleRow.3 +@man man/man3/XmMultiListUnselectAllItems.3 +@man man/man3/XmMultiListUnselectItem.3 @man man/man3/XmNotebook.3 @man man/man3/XmNotebookGetPageInfo.3 @man man/man3/XmObjectAtPoint.3 @man man/man3/XmOptionButtonGadget.3 @man man/man3/XmOptionLabelGadget.3 +@man man/man3/XmOutline.3 +@man man/man3/XmPaned.3 +@man man/man3/XmPanedGetPanes.3 @man man/man3/XmPanedWindow.3 @man man/man3/XmParseMapping.3 @man man/man3/XmParseMappingCreate.3 @@ -622,6 +730,7 @@ lib/libXm.a @man man/man3/XmSimpleSpinBoxAddItem.3 @man man/man3/XmSimpleSpinBoxDeletePos.3 @man man/man3/XmSimpleSpinBoxSetItem.3 +@man man/man3/XmSlideContext.3 @man man/man3/XmSpinBox.3 @man man/man3/XmSpinBoxValidatePosition.3 @man man/man3/XmString.3 @@ -688,6 +797,10 @@ lib/libXm.a @man man/man3/XmTabListReplacePositions.3 @man man/man3/XmTabListTabCount.3 @man man/man3/XmTabSetValue.3 +@man man/man3/XmTabStack.3 +@man man/man3/XmTabStackGetSelectedTab.3 +@man man/man3/XmTabStackSelectTab.3 +@man man/man3/XmTabStackXYToWidget.3 @man man/man3/XmTargetsAreCompatible.3 @man man/man3/XmText.3 @man man/man3/XmTextClearSelection.3 @@ -785,28 +898,120 @@ lib/libXm.a @man man/man3/XmTransferStartRequest.3 @man man/man3/XmTransferValue.3 @man man/man3/XmTranslateKey.3 +@man man/man3/XmTree.3 @man man/man3/XmUninstallImage.3 @man man/man3/XmUpdateDisplay.3 +@man man/man3/XmVaCreateArrowButton.3 +@man man/man3/XmVaCreateArrowButtonGadget.3 +@man man/man3/XmVaCreateBulletinBoard.3 +@man man/man3/XmVaCreateButtonBox.3 +@man man/man3/XmVaCreateCascadeButton.3 +@man man/man3/XmVaCreateCascadeButtonGadget.3 +@man man/man3/XmVaCreateColorSelector.3 +@man man/man3/XmVaCreateColumn.3 +@man man/man3/XmVaCreateCombinationBox2.3 +@man man/man3/XmVaCreateComboBox.3 +@man man/man3/XmVaCreateCommand.3 +@man man/man3/XmVaCreateContainer.3 +@man man/man3/XmVaCreateDataField.3 +@man man/man3/XmVaCreateDrawingArea.3 +@man man/man3/XmVaCreateDrawnButton.3 +@man man/man3/XmVaCreateDropDown.3 +@man man/man3/XmVaCreateExt18List.3 +@man man/man3/XmVaCreateFileSelectionBox.3 +@man man/man3/XmVaCreateForm.3 +@man man/man3/XmVaCreateFrame.3 +@man man/man3/XmVaCreateHierarchy.3 +@man man/man3/XmVaCreateIconGadget.3 +@man man/man3/XmVaCreateLabel.3 +@man man/man3/XmVaCreateLabelGadget.3 +@man man/man3/XmVaCreateList.3 +@man man/man3/XmVaCreateMainWindow.3 +@man man/man3/XmVaCreateManagedArrowButton.3 +@man man/man3/XmVaCreateManagedArrowButtonGadget.3 +@man man/man3/XmVaCreateManagedBulletinBoard.3 +@man man/man3/XmVaCreateManagedButtonBox.3 +@man man/man3/XmVaCreateManagedCascadeButton.3 +@man man/man3/XmVaCreateManagedCascadeButtonGadget.3 +@man man/man3/XmVaCreateManagedColorSelector.3 +@man man/man3/XmVaCreateManagedColumn.3 +@man man/man3/XmVaCreateManagedCombinationBox2.3 +@man man/man3/XmVaCreateManagedComboBox.3 +@man man/man3/XmVaCreateManagedCommand.3 +@man man/man3/XmVaCreateManagedContainer.3 +@man man/man3/XmVaCreateManagedDataField.3 +@man man/man3/XmVaCreateManagedDrawingArea.3 +@man man/man3/XmVaCreateManagedDrawnButton.3 +@man man/man3/XmVaCreateManagedDropDown.3 +@man man/man3/XmVaCreateManagedExt18List.3 +@man man/man3/XmVaCreateManagedFileSelectionBox.3 +@man man/man3/XmVaCreateManagedForm.3 +@man man/man3/XmVaCreateManagedFrame.3 +@man man/man3/XmVaCreateManagedHierarchy.3 +@man man/man3/XmVaCreateManagedIconGadget.3 +@man man/man3/XmVaCreateManagedLabel.3 +@man man/man3/XmVaCreateManagedLabelGadget.3 +@man man/man3/XmVaCreateManagedList.3 +@man man/man3/XmVaCreateManagedMainWindow.3 +@man man/man3/XmVaCreateManagedMessageBox.3 +@man man/man3/XmVaCreateManagedMultiList.3 +@man man/man3/XmVaCreateManagedNotebook.3 +@man man/man3/XmVaCreateManagedOutline.3 +@man man/man3/XmVaCreateManagedPanedWindow.3 +@man man/man3/XmVaCreateManagedPushButton.3 +@man man/man3/XmVaCreateManagedPushButtonGadget.3 +@man man/man3/XmVaCreateManagedRowColumn.3 +@man man/man3/XmVaCreateManagedScale.3 +@man man/man3/XmVaCreateManagedScrollBar.3 +@man man/man3/XmVaCreateManagedScrolledWindow.3 +@man man/man3/XmVaCreateManagedSelectionBox.3 +@man man/man3/XmVaCreateManagedSeparatorGadget.3 +@man man/man3/XmVaCreateManagedSimpleSpinBox.3 +@man man/man3/XmVaCreateManagedSpinBox.3 +@man man/man3/XmVaCreateManagedTabStack.3 +@man man/man3/XmVaCreateManagedText.3 +@man man/man3/XmVaCreateManagedTextField.3 +@man man/man3/XmVaCreateManagedToggleButton.3 +@man man/man3/XmVaCreateManagedToggleButtonGadget.3 +@man man/man3/XmVaCreateMessageBox.3 +@man man/man3/XmVaCreateMultiList.3 +@man man/man3/XmVaCreateNotebook.3 +@man man/man3/XmVaCreateOutline.3 +@man man/man3/XmVaCreatePanedWindow.3 +@man man/man3/XmVaCreatePushButton.3 +@man man/man3/XmVaCreatePushButtonGadget.3 +@man man/man3/XmVaCreateRowColumn.3 +@man man/man3/XmVaCreateScale.3 +@man man/man3/XmVaCreateScrollBar.3 +@man man/man3/XmVaCreateScrolledWindow.3 +@man man/man3/XmVaCreateSelectionBox.3 +@man man/man3/XmVaCreateSeparatorGadget.3 @man man/man3/XmVaCreateSimpleCheckBox.3 @man man/man3/XmVaCreateSimpleMenuBar.3 @man man/man3/XmVaCreateSimpleOptionMenu.3 @man man/man3/XmVaCreateSimplePopupMenu.3 @man man/man3/XmVaCreateSimplePulldownMenu.3 @man man/man3/XmVaCreateSimpleRadioBox.3 +@man man/man3/XmVaCreateSimpleSpinBox.3 +@man man/man3/XmVaCreateSpinBox.3 +@man man/man3/XmVaCreateTabStack.3 +@man man/man3/XmVaCreateText.3 +@man man/man3/XmVaCreateTextField.3 +@man man/man3/XmVaCreateToggleButton.3 +@man man/man3/XmVaCreateToggleButtonGadget.3 @man man/man3/XmWidgetGetBaselines.3 @man man/man3/XmWidgetGetDisplayRect.3 +@man man/man4/mwmrc.4 @man man/man5/Traits.5 @man man/man5/UIL.5 @man man/man5/WML.5 -@man man/man5/mwmrc.5 share/doc/openmotif/ share/doc/openmotif/BUGREPORT -share/doc/openmotif/CLOSEDBUGS share/doc/openmotif/COPYRIGHT.MOTIF -share/doc/openmotif/LICENSE.html -share/doc/openmotif/OPENBUGS +share/doc/openmotif/LICENSE share/doc/openmotif/README share/doc/openmotif/README.OpenBSD share/doc/openmotif/RELEASE share/doc/openmotif/RELNOTES +share/doc/openmotif/TODO %%SHARED%%