diff options
| author | joerg <joerg> | 2005-12-12 19:55:41 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-12-12 19:55:41 +0000 |
| commit | 551ebf569b1950e4ed9629927a958e24028b4fe5 (patch) | |
| tree | ccf735520afb14d61b39efa368107839b298ba1a /x11/openmotif | |
| parent | c44f6ca1fdfb7c6addfdfa9b0e59a3810d10b09f (diff) | |
| download | pkgsrc-551ebf569b1950e4ed9629927a958e24028b4fe5.tar.gz | |
Update OpenMotif to 2.2.3. Too many changes to list here, but most
importantly no more imake usage.
Diffstat (limited to 'x11/openmotif')
36 files changed, 292 insertions, 2066 deletions
diff --git a/x11/openmotif/DEINSTALL b/x11/openmotif/DEINSTALL deleted file mode 100644 index 581235a003e..00000000000 --- a/x11/openmotif/DEINSTALL +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:23:08 jlam Exp $ - -X11BASE=@X11BASE@ -MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules -MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl -X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def -HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def - -case ${STAGE} in -POST-DEINSTALL) - ${ECHO} -n "Updating ${HOSTDEF}..." - ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak - ( ${GREP} -v OpenMotif ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} - ${RM} -f ${HOSTDEF}.bak - if [ ${PKG_PREFIX} != ${X11BASE} ] && \ - [ -f ${X11_HOSTDEF} ] && \ - ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF} - then - ${RM} -f ${HOSTDEF} - fi - ${ECHO} "done." - - ${RM} -f ${MOTIF_RULES} ${MOTIF_TMPL} - if [ ${PKG_PREFIX} = ${X11BASE} ] - then - ${MV} -f ${MOTIF_RULES}.openmotif.bak ${MOTIF_RULES} 2>/dev/null - ${MV} -f ${MOTIF_TMPL}.openmotif.bak ${MOTIF_TMPL} 2>/dev/null - fi - - ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} - ;; -esac diff --git a/x11/openmotif/INSTALL b/x11/openmotif/INSTALL deleted file mode 100644 index 5025bc6a536..00000000000 --- a/x11/openmotif/INSTALL +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: INSTALL,v 1.6 2004/03/12 02:03:25 reed Exp $ - -X11BASE=@X11BASE@ -MOTIF_RULES=${PKG_PREFIX}/lib/X11/config/Motif.rules -MOTIF_TMPL=${PKG_PREFIX}/lib/X11/config/Motif.tmpl -X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def -HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def - -case ${STAGE} in -POST-INSTALL) - if [ ${PKG_PREFIX} = ${X11BASE} ] - then - ${MV} -f ${MOTIF_RULES} ${MOTIF_RULES}.openmotif.bak 2>/dev/null - ${MV} -f ${MOTIF_TMPL} ${MOTIF_TMPL}.openmotif.bak 2>/dev/null - fi - ${LN} -sf OpenMotif.rules ${MOTIF_RULES} - ${LN} -sf OpenMotif.tmpl ${MOTIF_TMPL} - - if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] - then - ${ECHO} -n "Updating ${HOSTDEF} for OpenMotif ..." - ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak - else - ${ECHO} -n "Creating ${HOSTDEF} for OpenMotif ..." - if [ -f ${X11_HOSTDEF} ] - then - ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak - else - ${CP} -f /dev/null ${HOSTDEF}.bak - fi - fi - ( ${GREP} -v OpenMotif ${HOSTDEF}.bak; \ - ${ECHO} '#include <OpenMotif.def>'; \ - ) > ${HOSTDEF} - ${RM} -f ${HOSTDEF}.bak - ${ECHO} "done." - ;; -esac diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index d8efa625a34..3aed4c7bc10 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,20 +1,12 @@ -# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/12 19:55:41 joerg Exp $ -PKGVER= 2.1.30 -DISTNAME= openmotif${PKGVER} +PKGVER= 2.2.3 +DISTNAME= openMotif-${PKGVER} PKGNAME= openmotif-${PKGVER} -PKGREVISION= 4 CATEGORIES= x11 -MOTIF_SITES= ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \ - ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \ - ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PKGVER}/ -MASTER_SITES= ${MOTIF_SITES:=tars/} +MASTER_SITES= http://ftp.motifzone.com/src/ -PATCH_SITES= ${MOTIF_SITES:=fixes/} -PATCHFILES= patch1 patch2 patch3 patch4 patch5 -PATCH_DIST_STRIP= -p1 - -MAINTAINER= tech-pkg@NetBSD.org +MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.opengroup.org/openmotif/ COMMENT= The Open Group Motif toolkit for the X Window System @@ -22,43 +14,21 @@ CONFLICTS+= lesstif-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/motif -DIST_SUBDIR= openmotif USE_X11BASE= yes -USE_PKGINSTALL= yes -BUILD_TARGET= World -USE_TOOLS+= tbl - -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - -FILES_SUBST+= X11BASE=${X11BASE:Q} - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "FreeBSD" -PLIST_SUBST+= AVAILABLE="@comment " -.else -PLIST_SUBST+= AVAILABLE= -.endif +USE_LIBTOOL= yes +USE_TOOLS= gmake tbl +GNU_CONFIGURE= yes -# We must use GNU make on Linux -.if ${OPSYS} == "Linux" -USE_TOOLS+= gmake -.endif +SUBST_CLASSES+= man_rename +SUBST_STAGE.man_rename= pre-configure +SUBST_MESSAGE.man_rename= "Fixing hardcoded paths." +SUBST_FILES.man_rename= doc/man/man3/Makefile.in +SUBST_SED.man_rename= -e 's: Core.3: XCore.3:g' \ + -e 's: Object.3: XObject.3:g' -e 's: Shell.3: XShell.3:g' -INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5 - -.include "../../mk/x11.buildlink3.mk" - -post-extract: - ${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules - ${CP} ${FILESDIR}/OpenMotif.def ${WRKSRC}/config/cf/Motif.def - ${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/DragonFly.cf # 1) Fix the man pages to refer to the correct sections. -# 2) Link Motif.* to OpenMotif.*. -# 3) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to +# 2) Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to # avoid manpage conflicts with other packages. # post-patch: @@ -72,13 +42,6 @@ post-patch: ${MV} -f $${manpage}.fixed $${manpage}; \ done; \ ${CP} -f man4/mwmrc.4 man5/mwmrc.5 - cd ${WRKSRC}/config/cf; \ - files="Motif.rules Motif.tmpl"; \ - for configfile in $${files}; do \ - dest="Open$${configfile}"; \ - ${RM} -f $${dest}; \ - ${LN} -s $${configfile} $${dest}; \ - done cd ${WRKSRC}/doc/man/man3; \ for name in Core Object Shell; do \ ${MV} -f $${name}.3 X$${name}.3; \ @@ -91,18 +54,6 @@ post-patch: done; \ done -# Link the appropriate directories since we're building OpenMotif outside -# of the X11R6 source tree. -# -do-configure: - ${MKDIR} ${WRKSRC}/imports/x11 - cd ${WRKSRC}/imports/x11; for dir in bin include lib; do \ - if [ -d $${dir} ]; then \ - ${RM} $${dir}; \ - fi; \ - ${LN} -s ${BUILDLINK_X11_DIR}/$${dir} $${dir}; \ - done - # Filter the manpages through tbl. post-build: cd ${WRKSRC}/doc/man; \ @@ -111,17 +62,5 @@ post-build: ${MV} -f $${manpage}.tblized $${manpage}; \ done -# Install the OpenMotif config files and manpages. -post-install: - cd ${WRKSRC}/config/cf; \ - files="Motif.def Motif.rules Motif.tmpl"; \ - for configfile in $${files}; do \ - dest="${PREFIX}/lib/X11/config/Open$${configfile}"; \ - ${INSTALL_DATA} $${configfile} $${dest}; \ - done - cd ${WRKSRC}/doc/man; \ - for manpage in man1/*.1 man3/*.3 man5/*.5; do \ - ${INSTALL_MAN} $${manpage} ${PREFIX}/man/$${manpage}; \ - done - +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/openmotif/PLIST b/x11/openmotif/PLIST index a9f2f1607c6..80012378897 100644 --- a/x11/openmotif/PLIST +++ b/x11/openmotif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/02/02 23:10:29 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/12/12 19:55:41 joerg Exp $ bin/mwm bin/uil bin/xmbind @@ -27,10 +27,11 @@ include/Xm/ArrowBG.h include/Xm/ArrowBGP.h include/Xm/ArrowBP.h include/Xm/AtomMgr.h -include/Xm/BaseClassI.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 @@ -40,7 +41,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 @@ -49,6 +56,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 @@ -64,17 +74,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 @@ -83,6 +102,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 @@ -109,12 +134,20 @@ 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/Picture.h +include/Xm/PictureP.h include/Xm/PointInT.h include/Xm/Primitive.h include/Xm/PrimitiveP.h @@ -150,9 +183,16 @@ 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/TabBox.h +include/Xm/TabBoxP.h +include/Xm/TabList.h +include/Xm/TabStack.h +include/Xm/TabStackP.h include/Xm/TakesDefT.h include/Xm/TearOffBP.h include/Xm/TearOffP.h @@ -175,6 +215,8 @@ 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 @@ -189,17 +231,19 @@ include/Xm/XmAll.h include/Xm/XmIm.h include/Xm/XmP.h include/Xm/XmStrDefs.h +include/Xm/XmStrDefs22.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/uil/Uil.h include/uil/UilDBDef.h include/uil/UilDef.h include/uil/UilSymDef.h include/uil/UilSymGl.h include/uil/XmAppl.uil -lib/X11/app-defaults/Mwm -lib/X11/bindings/CDE lib/X11/bindings/acorn lib/X11/bindings/apollo lib/X11/bindings/dec @@ -226,28 +270,17 @@ lib/X11/bindings/sun lib/X11/bindings/sun_at lib/X11/bindings/tek lib/X11/bindings/xmbind.alias -lib/X11/config/OpenMotif.def -lib/X11/config/OpenMotif.rules -lib/X11/config/OpenMotif.tmpl lib/X11/system.mwmrc -lib/libMrm.a -lib/libMrm.so -lib/libMrm.so.2 -${AVAILABLE}lib/libMrm.so.2.1 -lib/libUil.a -lib/libUil.so -lib/libUil.so.2 -${AVAILABLE}lib/libUil.so.2.1 -lib/libXm.a -lib/libXm.so -lib/libXm.so.2 -${AVAILABLE}lib/libXm.so.2.1 +lib/libMrm.la +lib/libUil.la +lib/libXm.la man/man1/mwm.1 man/man1/uil.1 man/man1/xmbind.1 man/man3/ApplicationShell.3 man/man3/Composite.3 man/man3/Constraint.3 +man/man3/XCore.3 man/man3/MrmCloseHierarchy.3 man/man3/MrmFetchBitmapLiteral.3 man/man3/MrmFetchColorLiteral.3 @@ -263,8 +296,10 @@ man/man3/MrmOpenHierarchyPerDisplay.3 man/man3/MrmRegisterClass.3 man/man3/MrmRegisterNames.3 man/man3/MrmRegisterNamesInHierarchy.3 +man/man3/XObject.3 man/man3/OverrideShell.3 man/man3/RectObj.3 +man/man3/XShell.3 man/man3/TopLevelShell.3 man/man3/TransientShell.3 man/man3/Uil.3 @@ -272,9 +307,6 @@ man/man3/UilDumpSymbolTable.3 man/man3/VendorShell.3 man/man3/VirtualBindings.3 man/man3/WMShell.3 -man/man3/XCore.3 -man/man3/XObject.3 -man/man3/XShell.3 man/man3/XmActivateProtocol.3 man/man3/XmActivateWMProtocol.3 man/man3/XmAddProtocolCallback.3 @@ -286,6 +318,7 @@ man/man3/XmAddWMProtocols.3 man/man3/XmArrowButton.3 man/man3/XmArrowButtonGadget.3 man/man3/XmBulletinBoard.3 +man/man3/XmButtonBox.3 man/man3/XmCascadeButton.3 man/man3/XmCascadeButtonGadget.3 man/man3/XmCascadeButtonGadgetHighlight.3 @@ -308,6 +341,8 @@ man/man3/XmClipboardStartRetrieve.3 man/man3/XmClipboardUndoCopy.3 man/man3/XmClipboardUnlock.3 man/man3/XmClipboardWithdrawFormat.3 +man/man3/XmColorSelector.3 +man/man3/XmColumn.3 man/man3/XmComboBox.3 man/man3/XmComboBoxAddItem.3 man/man3/XmComboBoxDeletePos.3 @@ -344,6 +379,7 @@ man/man3/XmCreateDialogShell.3 man/man3/XmCreateDragIcon.3 man/man3/XmCreateDrawingArea.3 man/man3/XmCreateDrawnButton.3 +man/man3/XmCreateDropDown.3 man/man3/XmCreateDropDownComboBox.3 man/man3/XmCreateDropDownList.3 man/man3/XmCreateErrorDialog.3 @@ -362,6 +398,7 @@ man/man3/XmCreateMenuBar.3 man/man3/XmCreateMenuShell.3 man/man3/XmCreateMessageBox.3 man/man3/XmCreateMessageDialog.3 +man/man3/XmCreateMultiList.3 man/man3/XmCreateNotebook.3 man/man3/XmCreateOptionMenu.3 man/man3/XmCreatePanedWindow.3 @@ -405,6 +442,7 @@ man/man3/XmCvtTextPropertyToXmStringTable.3 man/man3/XmCvtXmStringTableToTextProperty.3 man/man3/XmCvtXmStringToByteStream.3 man/man3/XmCvtXmStringToCT.3 +man/man3/XmDataField.3 man/man3/XmDeactivateProtocol.3 man/man3/XmDeactivateWMProtocol.3 man/man3/XmDestroyPixmap.3 @@ -420,6 +458,12 @@ man/man3/XmDragIcon.3 man/man3/XmDragStart.3 man/man3/XmDrawingArea.3 man/man3/XmDrawnButton.3 +man/man3/XmDropDown.3 +man/man3/XmDropDownGetArrow.3 +man/man3/XmDropDownGetLabel.3 +man/man3/XmDropDownGetList.3 +man/man3/XmDropDownGetText.3 +man/man3/XmDropDownGetValue.3 man/man3/XmDropSite.3 man/man3/XmDropSiteConfigureStackingOrder.3 man/man3/XmDropSiteEndUpdate.3 @@ -452,6 +496,7 @@ man/man3/XmFontListGetNextFont.3 man/man3/XmFontListInitFontContext.3 man/man3/XmFontListNextEntry.3 man/man3/XmFontListRemoveEntry.3 +man/man3/XmFontSelector.3 man/man3/XmForm.3 man/man3/XmFrame.3 man/man3/XmGadget.3 @@ -472,6 +517,8 @@ man/man3/XmGetTearOffControl.3 man/man3/XmGetVisibility.3 man/man3/XmGetXmDisplay.3 man/man3/XmGetXmScreen.3 +man/man3/XmIconBox.3 +man/man3/XmIconButton.3 man/man3/XmIconGadget.3 man/man3/XmImCloseXIM.3 man/man3/XmImFreeXIC.3 @@ -541,6 +588,18 @@ man/man3/XmMenuPosition.3 man/man3/XmMenuShell.3 man/man3/XmMessageBox.3 man/man3/XmMessageBoxGetChild.3 +man/man3/XmMultiList.3 +man/man3/XmMultiListDeselectAllItems.3 +man/man3/XmMultiListDeselectItem.3 +man/man3/XmMultiListDeselectItems.3 +man/man3/XmMultiListDeselectRow.3 +man/man3/XmMultiListGetSelectedRowArray.3 +man/man3/XmMultiListGetSelectedRows.3 +man/man3/XmMultiListMakeRowVisible.3 +man/man3/XmMultiListSelectAllItems.3 +man/man3/XmMultiListSelectItems.3 +man/man3/XmMultiListSelectRow.3 +man/man3/XmMultiListToggleRow.3 man/man3/XmNotebook.3 man/man3/XmNotebookGetPageInfo.3 man/man3/XmObjectAtPoint.3 @@ -621,6 +680,7 @@ man/man3/XmSimpleSpinBox.3 man/man3/XmSimpleSpinBoxAddItem.3 man/man3/XmSimpleSpinBoxDeletePos.3 man/man3/XmSimpleSpinBoxSetItem.3 +man/man3/XmSlideContext.3 man/man3/XmSpinBox.3 man/man3/XmSpinBoxValidatePosition.3 man/man3/XmString.3 @@ -687,6 +747,7 @@ man/man3/XmTabListRemoveTabs.3 man/man3/XmTabListReplacePositions.3 man/man3/XmTabListTabCount.3 man/man3/XmTabSetValue.3 +man/man3/XmTabStack.3 man/man3/XmTargetsAreCompatible.3 man/man3/XmText.3 man/man3/XmTextClearSelection.3 @@ -784,6 +845,7 @@ man/man3/XmTransferSetParameters.3 man/man3/XmTransferStartRequest.3 man/man3/XmTransferValue.3 man/man3/XmTranslateKey.3 +man/man3/XmTree.3 man/man3/XmUninstallImage.3 man/man3/XmUpdateDisplay.3 man/man3/XmVaCreateSimpleCheckBox.3 @@ -794,11 +856,12 @@ man/man3/XmVaCreateSimplePulldownMenu.3 man/man3/XmVaCreateSimpleRadioBox.3 man/man3/XmWidgetGetBaselines.3 man/man3/XmWidgetGetDisplayRect.3 +man/man5/mwmrc.5 man/man5/Traits.5 man/man5/UIL.5 man/man5/WML.5 -man/man5/mwmrc.5 -@dirrm lib/X11/bindings -@dirrm include/uil -@dirrm include/Xm @dirrm include/Mrm +@dirrm include/X11/bitmaps +@dirrm include/Xm +@dirrm include/uil +@dirrm lib/X11/bindings diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo index 72b496946c9..4abc38e5a5f 100644 --- a/x11/openmotif/distinfo +++ b/x11/openmotif/distinfo @@ -1,49 +1,19 @@ -$NetBSD: distinfo,v 1.18 2005/08/15 19:17:22 erh Exp $ +$NetBSD: distinfo,v 1.19 2005/12/12 19:55:41 joerg Exp $ -SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc -RMD160 (openmotif/openmotif2.1.30.tar.gz) = b404b925dbb6fe4ff6c522edf3d0f511637fb872 -Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes -SHA1 (openmotif/patch1) = 717959c6f1dbba05b8f8f696f719cbcca84f44b9 -RMD160 (openmotif/patch1) = 916ce1f0742fe580d5a05c12763d3e4082d6340c -Size (openmotif/patch1) = 630 bytes -SHA1 (openmotif/patch2) = 7fc9a1e84ea1ef69b41ff02b2acb442d7500211b -RMD160 (openmotif/patch2) = d0b57e2e701005cc803aaf2145054dcff14b116b -Size (openmotif/patch2) = 8258 bytes -SHA1 (openmotif/patch3) = 427f4aa9152979b8653ea0a1177496f0bcaafde7 -RMD160 (openmotif/patch3) = c62322fde165c05eddbb9718d227b23e4a3ba0df -Size (openmotif/patch3) = 195096 bytes -SHA1 (openmotif/patch4) = 63af3871e562b79f4544c37a783e3396c33a21ec -RMD160 (openmotif/patch4) = bf9e1de2c873517518fc428dd19fe6e4956d1848 -Size (openmotif/patch4) = 126297 bytes -SHA1 (openmotif/patch5) = 0100c1100714ff454bbd40d1abc0da566c03fe6e -RMD160 (openmotif/patch5) = 410ca8bad32be23fa6c0b776e67bad95819d461f -Size (openmotif/patch5) = 480141 bytes -SHA1 (patch-aa) = 8b7cd330749eb27bfd08480f66da95a256dbf390 -SHA1 (patch-ab) = e6969390c2ac41bce9e36e17958d3e92ac2d87a4 -SHA1 (patch-ac) = 9ca57238197458fb1729ba1c4300bf5ad82805a2 -SHA1 (patch-ad) = 675b77555994293f69182c67c336683755a6b0f4 -SHA1 (patch-ae) = 4bea5f3b09574d2c51a2b77e1daef78098e87c71 -SHA1 (patch-af) = 10d4f98dd3a593c17ec6a59eb326c6f3d778c9cb -SHA1 (patch-ag) = 7a46b6954ef1ce283122d0f42a987d359ca350c4 -SHA1 (patch-ah) = db57ad992f2f68b2f4d5393be336cd47b9781746 -SHA1 (patch-ai) = 548a08419a5e3511897407ca7ae0f0d5b9c163d7 -SHA1 (patch-aj) = 10eeb1a20575e007de16a606bbccb3c663b2be75 -SHA1 (patch-ak) = e11410034479271779385035acbffe1a815b704f -SHA1 (patch-al) = 541f2d751958fae906008a3196d19a42d71b8548 -SHA1 (patch-am) = 4678858fb8c2d709a1f0aff5bf4f135d0ec54fe7 -SHA1 (patch-an) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1 -SHA1 (patch-ao) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17 -SHA1 (patch-ap) = 8b9fe7fcf076f6a1162f5b8a3003bbb78204bc8b -SHA1 (patch-aq) = f06bde8d2151c3b60fce74e663b7eead965758a8 -SHA1 (patch-ar) = a75ee71f65008445614a9688a54cf35d96de8b38 -SHA1 (patch-as) = a7078fe22854c7e4634d8e03da1570ad2e283065 -SHA1 (patch-at) = d75e7b060797997f47f0da3099e53d5d8e5c6c68 -SHA1 (patch-au) = 3559258736a8534b930750294bc0865a17a51e7e -SHA1 (patch-av) = 2729c9edbcbbb62016305a1f0293684b805ce50d -SHA1 (patch-aw) = 604a2b3d99dd62a34ca624a315d85d2e56450e4e -SHA1 (patch-ax) = de1ee2594e39bec4cab599aa45d4b9d5af80fc7e -SHA1 (patch-ay) = 38187926dcc27c510880e17ff2d6c35cd5e8393e -SHA1 (patch-az) = 15f8d029940fc04be246ad7a479f14af6e38af03 +SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4 +RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179 +Size (openMotif-2.2.3.tar.gz) = 5149785 bytes +SHA1 (patch-aa) = 5c204036a831ca890b196c6f7d23be2fdb848980 +SHA1 (patch-ab) = 2243e335412b124e1ac57f57d25b5afdeacd987c +SHA1 (patch-ac) = 4bb397b9a57208e47dc88b8b725596ce8c600751 +SHA1 (patch-ad) = 4903cbf3b9ac6e2dd2f8e327bb33f5743650787e +SHA1 (patch-ae) = 47db1a43eda588f8502a33a46f1eaf7a72449812 +SHA1 (patch-af) = 5ea54810105cfb2fc9d4a828e32208318e3c5d42 +SHA1 (patch-ag) = c7e461c35ef4bdbcc8917917a34ab546760cb5cc +SHA1 (patch-ah) = d94132709d6b69d437a37616834bda8cc42592ba +SHA1 (patch-aj) = 0f8ba09947dcbab85fa30fc5f126e07a9ebfb930 +SHA1 (patch-ak) = 8fe997bd930111cd04c051c5cffdf2b930f0c356 +SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f SHA1 (patch-ba) = c8a13cc06db7413ddb0abcc2b6e9781d4b9550ef SHA1 (patch-bb) = 1d38da709ee1231323feb0e348be6dafd54d755d SHA1 (patch-bc) = 87915f61d20e4defd6ac3a68667528515b6b88a0 @@ -51,6 +21,5 @@ SHA1 (patch-bd) = 8f46473bb0380ce69b2eadc1c65322094d538bf8 SHA1 (patch-be) = 35a24957def48a2f2771f34ebc53ecf83c827a66 SHA1 (patch-bf) = 211d84bccf91ed474634658a75af5d8977b052d4 SHA1 (patch-bg) = 582f455b066bd4f12160d719c885e9d8423632e5 -SHA1 (patch-bh) = 4025190b6200398b54cfa075da8976e96bf7c3ee +SHA1 (patch-bh) = 09401eb3e5e6e7e911a9268f2ba0cd6ddaeed3b4 SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723 -SHA1 (patch-bj) = c7e2e4613d6911628ecc4f019ab5f78a2c4c03ea diff --git a/x11/openmotif/files/DragonFly.cf b/x11/openmotif/files/DragonFly.cf deleted file mode 100644 index c4f7b7db644..00000000000 --- a/x11/openmotif/files/DragonFly.cf +++ /dev/null @@ -1,228 +0,0 @@ -#define UseElfFormat YES -#define OSBinaryFormat [ELF] - -#ifndef OSName -#define OSName DefaultOSName OSBinaryFormat -#endif -#ifndef OSVendor -#define OSVendor /**/ -#endif -#ifndef OSMajorVersion -#define OSMajorVersion DefaultOSMajorVersion -#endif -#ifndef OSMinorVersion -#define OSMinorVersion DefaultOSMinorVersion -#endif -#ifndef OSTeenyVersion -#define OSTeenyVersion DefaultOSTeenyVersion -#endif -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - -#define HasGcc YES -#define HasGcc2 YES -#define HasCplusplus YES -#define HasGcc2ForCplusplus YES -#define GccUsesGas YES -#define UseGas YES -#define GnuCpp YES -#define HasNdbm YES -#define HasPutenv YES -#define HasSnprintf YES -#define HasBSD44Sockets YES -#ifndef HasLibCrypt -# define HasLibCrypt YES -#endif -#ifndef HasShm -# define HasShm YES -#endif -#define HasWChar32 YES - -#define AvoidNullMakeCommand YES -#define StripInstalledPrograms YES -#define CompressAllFonts YES -#define Malloc0ReturnsNull YES -#define NeedConstPrototypes YES -#define NeedFunctionPrototypes YES -#define NeedNestedPrototypes YES -#define NeedVarargsPrototypes YES -#define NeedWidePrototypes NO - -#define MkdirHierCmd mkdir -p - -#define CcCmd cc -#define CppCmd /usr/libexec/cpp -#define PreProcessCmd CppCmd -#define StandardCppDefines -traditional -#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) -#define DefaultCCOptions /**/ -#else -#define DefaultCCOptions -Dasm=__asm -#endif -#ifndef ExtraLibraries -/* support for multi-byte locales is in libxpg4 rather than libc */ -#define ExtraLibraries /**/ -#endif -#ifndef UseGnuMalloc -#define UseGnuMalloc NO -#endif - -#define HasSetUserContext YES - -#ifndef ExtraLoadFlags -#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -#endif - -#ifndef SharedLibraryLoadFlags -#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) -#endif - -#ifndef GnuMallocLibrary -#define GnuMallocLibrary -lgnumalloc -#endif - -#ifndef HasZlib -#define HasZlib YES -#endif - -#define InstallCmd /usr/bin/install - -# define AsmElfDefines -D__ELF__ - -#if GccUsesGas -# define GccGasOption -DGCCUSESGAS -# define AsmDefines -DUSE_GAS AsmElfDefines -#else -# define GccGasOption /**/ -# define AsmDefines AsmElfDefines -#endif - -#define ServerExtraDefines GccGasOption XFree86ServerDefines - -#define StandardDefines -DCSRG_BASED - -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#define XawI18nDefines -DUSE_XWCHAR_STRING -#define HasMakefileSafeInclude YES -#define IncludeMakefile(file) @@# dependencies are in .depend -#define DependFileName .depend -#ifndef BuildDynamicLoading -#define BuildDynamicLoading YES -#endif -#ifndef ForceNormalLib -#define ForceNormalLib YES -#endif -#define HasMkstemp YES - -#define OptimizedCDebugFlags -O2 - -#ifndef PreIncDir -# define PreIncDir /usr/include -#endif - -#define TroffCmd groff -Tps -#define NroffCmd groff -Tascii -#define SetTtyGroup YES - -#ifndef ExtraFilesToClean -# define ExtraFilesToClean *.core -#endif - -#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin -#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) -#ifndef SystemManDirectory -#define SystemManDirectory /usr/share/man -#endif - -#define InstKmemFlags -g kmem -m 2755 - -/* - * Compress manual pages - */ -#ifndef CompressManPages -# define CompressManPages YES -#endif - -#if CompressManPages - -#ifndef CompressManCmd -# define CompressManCmd gzip -n -#endif - COMPRESSMANCMD = CompressManCmd - -#ifndef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) -#endif - -#ifndef InstallGenManPageLong -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.suffix @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix -#endif - -#ifndef InstallMultipleMan -#define InstallMultipleMan(list,dest) @@\ -install.man:: list @@\ - MakeDir($(DESTDIR)dest) @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (set -x; \ @@\ - MNAME=`echo $$i | cut -f1 -d.`; \ @@\ - $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ - $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ - $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ - done -#endif - -/* - * InstallManPageAliases - install soft links for aliases. - */ -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ -install.man:: @@\ - @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ - (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ - $$i.$${SUFFIX})); \ @@\ - done) -#endif - -/* - * InstallGenManPageAliases - install soft links for aliases. - */ -#ifndef InstallGenManPageAliases -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) -#endif -#endif - -#define HasBsdMake YES - -#ifndef StaticLibrary -#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic -#endif - -#define DlLibrary -rdynamic - -#if BuildDynamicLoading -#define ServerExtraSysLibs DlLibrary -#else -#define ServerExtraSysLibs /**/ -#endif - -#include <bsdLib.rules> - -#ifdef i386Architecture -#include <xfree86.cf> -#endif diff --git a/x11/openmotif/files/NoInstall.rules b/x11/openmotif/files/NoInstall.rules deleted file mode 100644 index e1934711d43..00000000000 --- a/x11/openmotif/files/NoInstall.rules +++ /dev/null @@ -1,56 +0,0 @@ -XCOMM $NetBSD: NoInstall.rules,v 1.1 2001/09/08 20:03:43 jlam Exp $ -XCOMM -XCOMM Redefine installation targets to nothing. - -#undef InstallNamedTarget -#define InstallNamedTarget(step,srcname,flags,dest,dstname) -#undef InstallTarget -#define InstallTarget(step,file,flags,dest) -#undef InstallLibrary -#define InstallLibrary(libname,dest) -#undef InstallLibraryAlias -#define InstallLibraryAlias(libname,alias,dest) -#undef InstallLintLibrary -#define InstallLintLibrary(libname,dest) -#undef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) -#undef InstallManPage -#define InstallManPage(file,destdir) -#undef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) -#undef InstallNamedNonExec -#define InstallNamedNonExec(srcname,dstname,dest) -#undef InstallNonExecFile -#define InstallNonExecFile(file,dest) -#undef InstallNonExecFileNoClobber -#define InstallNonExecFileNoClobber(file,dest) -#undef InstallNonExec -#define InstallNonExec(file,dest) -#undef InstallProgramWithFlags -#define InstallProgramWithFlags(program,dest,flags) -#undef InstallProgram -#define InstallProgram(program,dest) -#undef InstallScript -#define InstallScript(program,dest) -#undef InstallNamedProg -#define InstallNamedProg(srcname,dstname,dest) -#undef InstallNamedProgNoClobber -#define InstallNamedProgNoClobber(srcname,dstname,dest) -#undef InstallMultipleDestFlags -#define InstallMultipleDestFlags(step,list,dest,flags) -#undef InstallMultipleDest -#define InstallMultipleDest(step,list,dest) -#undef InstallMultiple -#define InstallMultiple(list,dest) -#undef InstallMultipleFlags -#define InstallMultipleFlags(list,dest,flags) -#undef InstallMultipleMan -#define InstallMultipleMan(list,dest) -#undef InstallSubdirs -#define InstallSubdirs(dirs) -#undef InstallManSubdirs -#define InstallManSubdirs(dirs) -#undef InstallSharedLibrary -#define InstallSharedLibrary(libname,rev,dest) -#undef InstallSharedLibraryData -#define InstallSharedLibraryData(libname,rev,dest) diff --git a/x11/openmotif/files/OpenMotif.def b/x11/openmotif/files/OpenMotif.def deleted file mode 100644 index 65a00e69e7c..00000000000 --- a/x11/openmotif/files/OpenMotif.def +++ /dev/null @@ -1,13 +0,0 @@ -/* $NetBSD: OpenMotif.def,v 1.2 2003/06/14 20:31:33 fredb Exp $ */ - -#ifndef TopLevelProject -# define TopLevelProject OpenMotif -#endif - -#ifndef ProjectRulesFile -# define ProjectRulesFile <OpenMotif.rules> -#endif - -#ifndef ProjectTmplFile -# define ProjectTmplFile <OpenMotif.tmpl> -#endif diff --git a/x11/openmotif/patches/patch-aa b/x11/openmotif/patches/patch-aa index d504f2d87f8..0e37c996f9d 100644 --- a/x11/openmotif/patches/patch-aa +++ b/x11/openmotif/patches/patch-aa @@ -1,16 +1,18 @@ -$NetBSD: patch-aa,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- bindings/Imakefile.orig Sat Sep 8 03:30:19 2001 -+++ bindings/Imakefile -@@ -37,10 +37,10 @@ - XCOMM HISTORY - XCOMM - XCOMM $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $ --INSTALLFLAGS = $(INSTINCFLAGS) +--- lib/Xm/TextF.c.orig 2005-11-25 05:28:12.000000000 +0100 ++++ lib/Xm/TextF.c +@@ -89,11 +89,11 @@ static char rcsid[] = "$TOG: TextF.c /ma + #include <Xm/PrintSP.h> /* for XmIsPrintShell */ - FILES = \ - xmbind.alias \ -+ CDE \ - acorn \ - apollo \ - dec \ + +-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__APPLE__) || defined(__OpenBSD__) + /* + * Modification by Integrated Computer Solutions, Inc. May 2000 + * +- * FreeBSD, DARWIN, NetBSD, and OpenBSD do not include the necessary wide ++ * DARWIN, NetBSD before 1.6, and OpenBSD do not include the necessary wide + * character string functions. Use the internal _Xwc... routines and add the + * other missing functions as _Xmwc... routines. The new functions + * are added static to this file. diff --git a/x11/openmotif/patches/patch-ab b/x11/openmotif/patches/patch-ab index 59f9a33744a..18e4fef9c1a 100644 --- a/x11/openmotif/patches/patch-ab +++ b/x11/openmotif/patches/patch-ab @@ -1,10 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- bitmaps/Imakefile.orig Fri Sep 7 22:06:54 2001 -+++ bitmaps/Imakefile -@@ -56,4 +56,4 @@ - - all:: - --InstallMultipleFlags($(HEADERS),$(XPROJECTROOT)/include/X11/bitmaps/,$(INSTINCFLAGS)) -+InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS)) +--- lib/Xm/Xmos_r.h.orig 2005-11-25 05:31:24.000000000 +0100 ++++ lib/Xm/Xmos_r.h +@@ -248,7 +248,7 @@ typedef struct { + * fields. + */ + +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) + { + memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); diff --git a/x11/openmotif/patches/patch-ac b/x11/openmotif/patches/patch-ac index 44794e84ef1..f4bc0d0d9f8 100644 --- a/x11/openmotif/patches/patch-ac +++ b/x11/openmotif/patches/patch-ac @@ -1,13 +1,15 @@ -$NetBSD: patch-ac,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- clients/mwm/Imakefile.orig Fri Sep 7 22:06:54 2001 -+++ clients/mwm/Imakefile -@@ -217,7 +217,7 @@ - CppFileTarget(sys.mwmrc,sys.mwmrc.src,$(LOCAL_CPP_DEFINES),) - */ +--- lib/Xm/Xmos.c.orig 2005-11-25 05:50:57.000000000 +0100 ++++ lib/Xm/Xmos.c +@@ -91,6 +91,10 @@ extern int regex(); --InstallNonExecFile(system.mwmrc,$(XPROJECTROOT)/lib/X11) -+InstallNonExecFile(system.mwmrc,$(LIBDIR)) - InstallAppDefaults(Mwm) + #include <sys/stat.h> - MessageCatalogRule(Mwm) ++#if defined(__NetBSD__) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++#endif ++ + #define X_INCLUDE_PWD_H + #define X_INCLUDE_DIRENT_H + #define XOS_USE_XT_LOCKING diff --git a/x11/openmotif/patches/patch-ad b/x11/openmotif/patches/patch-ad index 2d18dac2c65..4fcb76fc8dd 100644 --- a/x11/openmotif/patches/patch-ad +++ b/x11/openmotif/patches/patch-ad @@ -1,13 +1,28 @@ -$NetBSD: patch-ad,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-ad,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/cf/Imakefile.orig Sat Sep 8 00:39:50 2001 -+++ config/cf/Imakefile -@@ -123,6 +123,8 @@ +--- lib/Xm/Makefile.in.orig 2004-04-06 19:50:27.000000000 +0200 ++++ lib/Xm/Makefile.in +@@ -100,8 +100,6 @@ INCLUDES = -I.. -I$(srcdir)/.. -DXMBINDD - INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) + xmdir = $(includedir)/Xm -+#include <NoInstall.rules> -+ - all:: +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ +- + lib_LTLIBRARIES = libXm.la - InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS)) + TIP_SRCS = ToolTip.c +@@ -159,12 +157,13 @@ LTLIBRARIES = $(lib_LTLIBRARIES) + + DEFS = @DEFS@ -I. -I$(srcdir) -I../../include + CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libXm_la_LDFLAGS = ++libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + libXm_la_DEPENDENCIES = + @OM_XMU_TRUE@libXm_la_OBJECTS = XmStrDefs.lo ArrowB.lo ArrowBG.lo \ + @OM_XMU_TRUE@BulletinB.lo CallbackI.lo CascadeB.lo CascadeBG.lo \ diff --git a/x11/openmotif/patches/patch-ae b/x11/openmotif/patches/patch-ae index d620905ebf8..7d84ea2eb07 100644 --- a/x11/openmotif/patches/patch-ae +++ b/x11/openmotif/patches/patch-ae @@ -1,13 +1,16 @@ -$NetBSD: patch-ae,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/cf/bsdLib.rules.orig Sat Sep 8 03:07:54 2001 -+++ config/cf/bsdLib.rules -@@ -153,7 +153,7 @@ - #define ShLibIncludeFile <bsdLib.tmpl> +--- clients/uil/UilDB.c.orig 2005-11-25 10:43:27.000000000 +0100 ++++ clients/uil/UilDB.c +@@ -79,8 +79,9 @@ static char rcsid[] = "$XConsortium: Uil + #include <unistd.h> #endif - #ifndef SharedLibraryLoadFlags --#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIR) -+#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH) - #endif - #ifndef PositionIndependentCFlags - #define PositionIndependentCFlags -fPIC + +- +- ++#if defined(__NetBSD__) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L ++#endif + + #include "UilDefI.h" + diff --git a/x11/openmotif/patches/patch-af b/x11/openmotif/patches/patch-af index 0cc3e43a891..f5a0accce23 100644 --- a/x11/openmotif/patches/patch-af +++ b/x11/openmotif/patches/patch-af @@ -1,35 +1,22 @@ -$NetBSD: patch-af,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-af,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/cf/bsdLib.tmpl.orig Sat Sep 8 03:07:54 2001 -+++ config/cf/bsdLib.tmpl -@@ -59,18 +59,18 @@ - #endif +--- lib/Mrm/Makefile.in.orig 2005-11-25 10:46:23.000000000 +0100 ++++ lib/Mrm/Makefile.in +@@ -101,7 +101,7 @@ mrmdir = $(includedir)/Mrm - #define SharedX11Reqs SharedThreadReqs --#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) --#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs --#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) --#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) --#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) --#define SharedXiReqs $(LDPRELIB) $(XLIB) --#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary --#define SharedXtstReqs $(LDPRELIB) $(XLIB) --#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) --#define SharedSMReqs $(LDPRELIB) $(ICELIB) --#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs --#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs -+#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) -+#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs -+#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) -+#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) -+#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) -+#define SharedXiReqs $(LDPRELIBS) $(XLIB) -+#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary -+#define SharedXtstReqs $(LDPRELIBS) $(XLIB) -+#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) -+#define SharedSMReqs $(LDPRELIBS) $(ICELIB) -+#define SharedFrescoReqs $(LDPRELIBS) $(XLIBONLY) FrescoSysLibs -+#define SharedXtfReqs $(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs + libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} - #define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) - #define SharedXmReqs $(LDPRELIBS) SharedXReqs +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++LDFLAGS = @LDFLAGS@ + + lib_LTLIBRARIES = libMrm.la + +@@ -131,7 +131,7 @@ X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libMrm_la_LDFLAGS = ++libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + libMrm_la_DEPENDENCIES = ../Xm/libXm.la + libMrm_la_OBJECTS = MrmIbuffer.lo MrmIentry.lo MrmIfile.lo \ + MrmIheader.lo MrmIindex.lo MrmIindexw.lo MrmIrid.lo MrmIswap.lo \ diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag index fc13d85d7de..d4b59252c73 100644 --- a/x11/openmotif/patches/patch-ag +++ b/x11/openmotif/patches/patch-ag @@ -1,31 +1,22 @@ -$NetBSD: patch-ag,v 1.4 2003/05/19 19:43:17 jschauma Exp $ +$NetBSD: patch-ag,v 1.5 2005/12/12 19:55:41 joerg Exp $ ---- config/cf/host.def.orig Mon May 19 14:04:32 2003 -+++ config/cf/host.def Mon May 19 14:06:39 2003 -@@ -1,17 +1,19 @@ - #ifdef BeforeVendorCF +--- clients/uil/Makefile.in.orig 2005-11-25 10:50:34.000000000 +0100 ++++ clients/uil/Makefile.in +@@ -99,7 +99,7 @@ EXTRA_DIST = Uil.msg + # + bin_PROGRAMS = uil --#define TopLevelProject Motif --#define ProjectRoot /usr/X11R6 --#define X11ProjectRoot /usr/X11R6 -+#define TopLevelProject OpenMotif -+#undef ProjectRoot -+#define ProjectRoot $(PREFIX) -+#undef X11ProjectRoot -+#define X11ProjectRoot $(X11BASE) - #define VirtualBindingsPath $(LIBDIR)/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 BuildMotifDemos NO +-LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ ++LDFLAGS = @LDFLAGS@ - #endif /* BeforeVendorCF */ + libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la + +@@ -150,7 +150,7 @@ X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libUil_la_LDFLAGS = ++libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@ + libUil_la_OBJECTS = UilCmd.lo UilDiags.lo UilKeyTab.lo UilLexAna.lo \ + UilLexPars.lo UilLstLst.lo UilP2Out.lo UilP2Reslv.lo UilSarComp.lo \ + UilSarExp.lo UilSarInc.lo UilSarMod.lo UilSarObj.lo UilSarProc.lo \ diff --git a/x11/openmotif/patches/patch-ah b/x11/openmotif/patches/patch-ah index d5257e3309c..3647f3f10e0 100644 --- a/x11/openmotif/patches/patch-ah +++ b/x11/openmotif/patches/patch-ah @@ -1,13 +1,13 @@ -$NetBSD: patch-ah,v 1.2 2001/09/08 20:03:44 jlam Exp $ +$NetBSD: patch-ah,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/imake/Imakefile.orig Sat Sep 8 00:39:51 2001 -+++ config/imake/Imakefile -@@ -17,6 +17,8 @@ - CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\"" - DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) +--- Makefile.in.orig 2005-11-25 16:33:30.000000000 +0100 ++++ Makefile.in +@@ -101,7 +101,7 @@ EXTRA_DIST = BUGREPORT COPY + MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub config.log ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs -+#include <NoInstall.rules> -+ - #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture) - XBSDLIB = /**/ - #endif + +-SUBDIRS = bindings bitmaps config localized lib include tools clients doc demos ++SUBDIRS = bindings bitmaps config localized lib include tools clients doc + + AUTOMAKE_OPTIONS = 1.4 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/x11/openmotif/patches/patch-ai b/x11/openmotif/patches/patch-ai deleted file mode 100644 index cc6384a7d37..00000000000 --- a/x11/openmotif/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2001/09/08 20:03:45 jlam Exp $ - ---- config/imake/imake.c.orig Sun Oct 29 15:34:13 2000 -+++ config/imake/imake.c Sun Oct 29 15:38:27 2000 -@@ -148,6 +148,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) - /* This needs to be before _POSIX_SOURCE gets defined */ - # include <sys/param.h> -+# include <sys/time.h> - # include <sys/types.h> - # include <sys/sysctl.h> - #endif diff --git a/x11/openmotif/patches/patch-aj b/x11/openmotif/patches/patch-aj index 18a129b62ec..b976604017c 100644 --- a/x11/openmotif/patches/patch-aj +++ b/x11/openmotif/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.2 2001/09/08 20:03:45 jlam Exp $ +$NetBSD: patch-aj,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/makedepend/Imakefile.orig Sat Sep 8 00:39:51 2001 -+++ config/makedepend/Imakefile -@@ -13,6 +13,8 @@ - LDPRELIB = - LDPRELIBS = +--- doc/man/man5/Makefile.in.orig 2005-11-25 17:24:35.000000000 +0100 ++++ doc/man/man5/Makefile.in +@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in -+#include <NoInstall.rules> -+ - #if HasGcc && !defined(PreIncDir) - #define PreIncDir /usr/local/lib/gcc-include - #endif + EXTRA_DIST = $(man_MANS) + +-man_MANS = Traits.5 UIL.5 WML.5 ++man_MANS = Traits.5 UIL.5 WML.5 mwmrc.5 + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../include/config.h diff --git a/x11/openmotif/patches/patch-ak b/x11/openmotif/patches/patch-ak index db36b1f83a7..fa260565d36 100644 --- a/x11/openmotif/patches/patch-ak +++ b/x11/openmotif/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.2 2001/09/08 20:03:45 jlam Exp $ +$NetBSD: patch-ak,v 1.3 2005/12/12 19:55:41 joerg Exp $ ---- config/util/Imakefile.orig Fri Apr 28 11:04:07 2000 -+++ config/util/Imakefile -@@ -22,6 +22,8 @@ - LDPRELIB = - LDPRELIBS = +--- doc/man/man4/Makefile.in.orig 2005-11-25 17:25:13.000000000 +0100 ++++ doc/man/man4/Makefile.in +@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in -+#include <NoInstall.rules> -+ - all:: $(PROGRAMS) + EXTRA_DIST = $(man_MANS) - includes:: ProgramTargetName(makestrs) +-man_MANS = mwmrc.4 ++man_MANS = + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../include/config.h diff --git a/x11/openmotif/patches/patch-al b/x11/openmotif/patches/patch-al deleted file mode 100644 index 3fd685a0315..00000000000 --- a/x11/openmotif/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/09/08 20:03:45 jlam Exp $ - ---- doc/man/Imakefile.orig Fri Sep 7 22:06:56 2001 -+++ doc/man/Imakefile -@@ -3,7 +3,7 @@ - #define IHaveSubdirs - #define PassCDebugFlags - --SUBDIRS = man1 man3 man4 man5 -+SUBDIRS = man1 man3 man5 - - all:: - diff --git a/x11/openmotif/patches/patch-am b/x11/openmotif/patches/patch-am deleted file mode 100644 index 8e725d4e2e6..00000000000 --- a/x11/openmotif/patches/patch-am +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-am,v 1.1 2001/09/08 20:03:45 jlam Exp $ - ---- doc/man/man5/Imakefile.orig Fri Sep 7 23:38:35 2001 -+++ doc/man/man5/Imakefile -@@ -8,3 +8,4 @@ - InstallMotifManPage(Traits,5) - InstallMotifManPage(UIL,5) - InstallMotifManPage(WML,5) -+InstallMotifManPage(mwmrc,5) diff --git a/x11/openmotif/patches/patch-an b/x11/openmotif/patches/patch-an deleted file mode 100644 index 08c578287e3..00000000000 --- a/x11/openmotif/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2001/09/08 20:03:45 jlam Exp $ - ---- lib/Xm/TextF.c.orig Sun Oct 29 15:43:15 2000 -+++ lib/Xm/TextF.c Sun Oct 29 15:45:35 2000 -@@ -84,7 +84,7 @@ - #include <Xm/PrintSP.h> /* for XmIsPrintShell */ - - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__) - /* - * Modification by Integrated Computer Solutions, Inc. May 2000 - * diff --git a/x11/openmotif/patches/patch-ao b/x11/openmotif/patches/patch-ao deleted file mode 100644 index 1c6f3a2fe09..00000000000 --- a/x11/openmotif/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2001/09/08 20:03:45 jlam Exp $ - ---- tests/Performance/Startup/editor.c.orig Wed May 3 05:12:48 2000 -+++ tests/Performance/Startup/editor.c Wed Aug 9 19:29:43 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-ap b/x11/openmotif/patches/patch-ap deleted file mode 100644 index eaf406f84c7..00000000000 --- a/x11/openmotif/patches/patch-ap +++ /dev/null @@ -1,695 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2002/08/25 18:40:40 jlam Exp $ - ---- config/cf/NetBSD.cf.orig Sat Jun 22 00:09:12 2002 -+++ config/cf/NetBSD.cf -@@ -5,6 +5,34 @@ - XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $ - - -+ -+XCOMM -+XCOMM This file currently contains support for: -+XCOMM -+XCOMM NetBSD/i386 client/server -+XCOMM NetBSD/sparc client/server -+XCOMM NetBSD/sparc64 client/server -+XCOMM NetBSD/sun3 client/server -+XCOMM NetBSD/hp300 client -+XCOMM NetBSD/mac68k client/server -+XCOMM NetBSD/pmax client/server -+XCOMM NetBSD/amiga client/server -+XCOMM NetBSD/alpha client/server -+XCOMM NetBSD/arm32 client/server -+XCOMM NetBSD/atari client/server -+XCOMM NetBSD/vax client/server -+XCOMM NetBSD/pc532 client -+XCOMM NetBSD/x68k client/server -+XCOMM NetBSD/macppc client/server -+XCOMM NetBSD/hpcmips client/server -+XCOMM NetBSD/next68k client -+XCOMM NetBSD/prep client -+XCOMM NetBSD/news68k client -+XCOMM NetBSD/cobalt client -+XCOMM NetBSD/sgimips client -+XCOMM NetBSD/luna68k client -+XCOMM -+ - #ifndef OSName - #define OSName DefaultOSName OSBinaryType - #endif -@@ -14,17 +42,26 @@ - #ifndef OSMinorVersion - #define OSMinorVersion DefaultOSMinorVersion - #endif -+/* XXX this does not deal with patches, but, patches should not affect it */ -+/* 1 = A, 2 = B, 3 = C, 4 = D, 5 = E, ... */ - #ifndef OSTeenyVersion - #define OSTeenyVersion DefaultOSTeenyVersion - #endif - -+ - #ifndef OSVendor - #define OSVendor The NetBSD Foundation, Inc. - #endif -- - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - - /* -+ * Enable support for "xdmauth" authentification. -+ */ -+#ifndef HasXdmAuth -+#define HasXdmAuth NO -+#endif -+ -+/* - * C library features - */ - #if ((OSMajorVersion > 1) || \ -@@ -32,6 +69,7 @@ - (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1)) - # define HasPoll YES - #endif -+ - #define HasNdbm YES - #define HasPutenv YES - #define HasSnprintf YES -@@ -61,7 +99,20 @@ - (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2)) - # define HasDlsymBug YES - #endif --/* Mkstemp is there since 1.2 (at least) */ -+ -+/* -+ * The USB HID library came after 1.4 -+ */ -+#if ((OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 8)) -+# define HasUsbLib YES -+#endif -+ -+ -+#if OSMajorVersion >= 1 -+# define LexCmd lex -l -+#endif -+ - #if (!(OSMajorVersion == 0 || \ - (OSMajorVersion == 1 && OSMinorVersion < 2))) - #define HasMkstemp YES -@@ -97,13 +148,15 @@ - #define CcCmd gcc - #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) - #define DefaultCCOptions /**/ -+#elif defined(arm32Architecture) -+#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer - #else - #define DefaultCCOptions -ansi -Dasm=__asm - #endif - - #define GccGasOption -DGCCUSESGAS - #define AsmDefines -DUSE_GAS -- -+ - /* UseElfFormat defaults to YES if __ELF__ set */ - #ifndef UseElfFormat - # ifdef __ELF__ -@@ -115,26 +168,37 @@ - #endif - - /* -+ * Make sure the binaries know where to look for the shared libaries. -+ * NOTE: This is done in bsdLib.rules for ELF libraries! -+ */ -+#if (OSMajorVersion == 1 && OSMinorVersion >= 2) || OSMajorVersion > 1 -+# if !defined(UseElfFormat) || UseElfFormat == NO -+# define ExtraLoadFlags -R$(USRLIBDIR) -+# endif -+#endif -+ -+/* - * Dynamic loading supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. -- * -- * XXX May not be correct on NetBSD/pmax (ELF, but might not have -- * working shared libs). - */ - #if ((OSMajorVersion > 0) && \ - !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ - UseElfFormat - # ifndef BuildDynamicLoading --# define BuildDynamicLoading YES -+# define BuildDynamicLoading YES -+# endif -+# ifndef ForceNormalLib -+# define ForceNormalLib YES - # endif - #endif - - #if UseElfFormat --#define DlLibrary -rdynamic /* no -ldl yet */ -+# define DlLibrary -rdynamic /* no -ldl yet */ - #else --#define DlLibrary /**/ -+# define DlLibrary /**/ - #endif - -+/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ - #ifdef i386Architecture - # ifndef DefaultGcc2i386Opt - # if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) -@@ -148,35 +212,193 @@ - # else - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME - # endif --# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2 --# define ServerExtraSysLibs -li386 DlLibrary --# endif --#else --# define OptimizedCDebugFlags -O2 --# if defined(SparcArchitecture) || defined(AlphaArchitecture) --# define ServerOSDefines -DDDXOSINIT --# else --# define ServerOSDefines /**/ --# endif - # if BuildDynamicLoading --# define ServerExtraSysLibs DlLibrary -+# define ServerExtraSysLibs -li386 DlLibrary - # else - # define ServerExtraSysLibs /**/ - # endif --#endif --#ifdef i386Architecture - # define ServerExtraDefines GccGasOption XFree86ServerDefines - # ifndef XFree86ConsoleDefines - # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT - # endif - #else --# if defined(AlphaArchitecture) --# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# if defined(m68kArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 3 -+# define OptimizedCDebugFlags -O - # else --# define ServerExtraDefines GccGasOption -+# define OptimizedCDebugFlags -O2 - # endif - #endif - -+/* -+ * On mips, all libs are compiled with ABIcalls, not just sharedlibs. -+ * Disable MIPS specific code which was not used and tested. -+ */ -+#if defined(MipsArchitecture) -+# define SeparateSharedCompile NO -+# undef MipsArchitecture -+#endif -+ -+#if defined(SparcArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# if defined(Sparc64Architecture) -+# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# define OptimizedCDebugFlags -O0 /* workaround gcc codegen bug */ -+# else -+# define ServerExtraDefines GccGasOption -+# endif -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(Sun3Architecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__sun3__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(hp300Architecture) -+# define BuildServer NO /* XXX */ -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(mac68kArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__mac68k__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(AlphaArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D_XSERVER64 -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# undef OptimizedCDebugFlags /* XXX ??? */ -+# define OptimizedCDebugFlags /* XXX ??? */ -+#endif -+ -+#if defined(amigaArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__amiga__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(arm32Architecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -DDDXTIME -+# define ServerExtraDefines GccGasOption XFree86ServerDefines -+# ifndef XFree86ConsoleDefines -+# define XFree86ConsoleDefines -DPCCONS_SUPPORT -+# endif -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(atariArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__atari__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(VaxArchitecture) -+# define BuildServer NO -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(pc532Architecture) -+# define BuildServer NO -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(x68kArchitecture) -+# define BuildServer YES -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__x68k__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(macppcArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define ServerExtraDefines GccGasOption -D__macppc__ -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif -+ -+#if defined(pmaxArchitecture) -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(hpcmipsArchitecture) -+# define ServerOSDefines -DDDXOSINIT -+# define BuildServer YES -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+# define ServerExtraDefines -DSTATIC_COLOR -+# define XserverNeedsSetUID YES -+#endif -+ -+#if defined(next68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(prepArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(news68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(cobaltArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(sgimipsArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#if defined(luna68kArchitecture) -+# define BuildServer NO -+# define PexDynamicModule NO -+# define XieDynamicModule NO -+#endif -+ -+#ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O2 -+#endif -+ -+#ifndef PositionIndependentCFlags -+# define PositionIndependentCFlags -fPIC -+#endif -+ - #define StandardDefines -DCSRG_BASED - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - -@@ -184,7 +406,18 @@ - #define ExtraLibraries /**/ - #endif - #ifndef UseGnuMalloc -+/* -+ * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped -+ * to OSTeenyVersion == 10. This should be save since there will never a -+ * release for 1.4.10. -+ */ -+# if ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 10)) -+# define UseGnuMalloc NO -+# else - # define UseGnuMalloc YES -+# endif - #endif - #ifndef GnuMallocLibrary - #define GnuMallocLibrary -lgnumalloc -@@ -198,6 +431,13 @@ - #endif - #endif - -+/* 1.4R and later has setusercontext() */ -+# if ((OSMajorVersion > 1) || \ -+ (OSMajorVersion == 1 && OSMinorVersion > 4) || \ -+ (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 18)) -+#define HasSetUserContext YES -+#endif -+ - #define AdmDir /var/log - - /* -@@ -207,8 +447,17 @@ - #define StripInstalledPrograms YES - #define CompressAllFonts YES - #define GzipFontCompression YES --#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) --#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) -+#define DefaultUserPath /usr/bin:/bin:/usr/pkg/bin:$(BINDIR):/usr/local/bin -+#define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:$(BINDIR):/usr/local/bin:/usr/local/sbin -+ -+#define InstPgmFlags -s -m 0555 -o root -g wheel -+#define InstBinFlags -m 0555 -o root -g wheel -+#define InstUidFlags -m 4511 -o root -g wheel -+#define InstLibFlags -m 0444 -o root -g wheel -+#define InstIncFlags -m 0444 -o root -g wheel -+#define InstManFlags -m 0444 -o root -g wheel -+#define InstDatFlags -m 0444 -o root -g wheel -+#define InstKmemFlags -m 2555 -o root -g kmem - - #ifdef InstallCmd - # undef InstallCmd -@@ -219,11 +468,23 @@ - # define ExtraFilesToClean *.core - #endif - -+#ifdef arm32Architecture -+/* -+ * NetBSD's default .SUFFIXES target places .s at a higher priority -+ * than .c. This breaks architectures which use the .c versions of -+ * various files in the XFree86 server tree for which there are also -+ * .s versions. Default to the basic .SUFFIXES list specified in -+ * SUSv2 (without the SCCS-related suffixes) plus .cxx for Motif.rules. -+ */ -+.SUFFIXES: -+.SUFFIXES: .o .c .y .l .a .sh .f .cxx -+#endif -+ - /* - * Documentation formatting - */ --#define NeqnCmd neqn -Tlatin1 --#define NroffCmd nroff -Tlatin1 -+#define NeqnCmd neqn -Tascii -+#define NroffCmd nroff -Tascii - #define EqnCmd eqn -Tps - #define TroffCmd groff -Tps - -@@ -271,7 +532,10 @@ - -@if [ -f file.0 ]; \ @@\ - then \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ -- fi -+ fi @@\ -+ @@\ -+clean:: @@\ -+ $(RM) file.0 - - #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) -@@ -288,7 +552,16 @@ - done - - #define InstallMultipleMan(list,dest) @@\ -- InstallMultipleManSuffix(list,dest,man) -+ MakeDir($(DESTDIR)dest) @@\ -+ case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ -+ for i in list; do \ @@\ -+ (set -x; \ @@\ -+ MNAME=`echo $$i | cut -f1 -d.`; \ @@\ -+ cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ -+ $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.man $(DESTDIR)dest/$${MNAME}.0; \ @@\ -+ $(RM) /tmp/$$$$.man); \ @@\ -+ done -+ - - #define InstallManPageAliases(file,destdir,aliases) @@\ - install.man:: @@\ -@@ -306,13 +579,10 @@ - /* - * Shared libraries supported starting in 1.0 on a.out platforms, - * and on all ELF platforms. -- * -- * XXX May not be correct on NetBSD/pmax (ELF, but might not have -- * working shared libs). - */ - #if ((OSMajorVersion > 0) && \ -- !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ -- UseElfFormat -+ !defined(AlphaArchitecture) && !defined(MipsArchitecture)) \ -+ || UseElfFormat - # ifndef HasSharedLibraries - # define HasSharedLibraries YES - # endif -@@ -334,51 +604,179 @@ - #include <bsdLib.rules> - #endif /* HasSharedLibraries */ - --#if defined(i386Architecture) || defined(Arm32Architecture) -+#if defined(i386Architecture) || defined(arm32Architecture) || \ -+ defined(atariArchitecture) - # include <xfree86.cf> --#endif - - /* -- * Definitions for the SUN server on NetBSD/sparc -+ * XXX The DynamicModuleTarget macro in xf86.rules does NOT work properly -+ * XXX on ELF systems. This macro should be moved into bsdLib.rules, since -+ * XXX it depends on how shlibs are built on that platform. -+ * XXX -+ * XXX The following overrides DynamicModuleTarget so it should work on -+ * XXX ELF and a.out. - */ --#ifdef SparcArchitecture -+/* -+ * DynamicModuleTarget - build a module to be dynamically loaded -+ */ -+# undef DynamicModuleTarget -+# define DynamicModuleTarget(module,modlist) @@\ -+AllTarget(module) @@\ -+ @@\ -+module: modlist @@\ -+ RemoveFile($@) @@\ -+ $(CC) -nostdlib -o $@ -Wl,-Bshareable -R$(USRLIBDIR) modlist @@\ -+ @@\ -+clean:: @@\ -+ RemoveFile(module) -+ -+#endif /* i386Architecture || arm32Architecture || atariArchitecture */ -+ -+/* -+ * NetBSD always uses the XFree86 contrib distribution. -+ */ -+#undef XF86Contrib -+#define XF86Contrib YES -+ -+/* -+ * Definitions for the SUN server on NetBSD/sparc or NetBSD/sun3 -+ */ -+#if defined(SparcArchitecture) || defined(Sun3Architecture) - #ifndef Xsun24Server -+#if defined(SparcArchitecture) -+#define Xsun24Server YES -+#else - #define Xsun24Server NO - #endif -+#endif - #ifndef XsunServer - #define XsunServer YES - #endif - #ifndef XsunMonoServer - #define XsunMonoServer YES - #endif --#ifndef BuildScreenSaverLibrary --#define BuildScreenSaverLibrary YES - #endif -+ - /* -- * XFree86 uses its own (more portable) database routines to speed up -- * the RGB database lookups -- * However, if you want to use ndbm anyway, you can set that to NO in -- * site.def -+ * Definitions for the NetBSD/mac68k server. - */ --#ifndef UseRgbTxt --#define UseRgbTxt YES -+#ifdef mac68kArchitecture -+# ifndef Xmac68kServer -+# define Xmac68kServer YES -+# endif - #endif -+ -+/* -+ * Definitions for the NetBSD/vax server. -+ */ -+#ifdef VaxArchitecture -+# define XvaxMonoServer YES -+# if HasGcc -+# define BuildPexExt XvaxMonoServer -+# else -+# define BuildPex NO /* compiler runs out of table space */ -+# define BuildXInputLib NO /* compiler runs out of table space */ -+# endif -+# define HasSaberC NO -+# define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */ - #endif - - /* -- * Definition for compiling on MIPS machines -+ * Definitions for the NetBSD/amiga server. - */ --#ifdef MipsArchitecture --#define PositionIndependentCFlags --#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | --sed 's/\.[0-9]*$$//'` --#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) --#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB) -+#ifdef amigaArchitecture -+# ifndef XamigaCCmono -+# define XamigaCCmono NO -+# endif -+# ifndef XamigaCCcolor -+# define XamigaCCcolor YES -+# endif -+# ifndef XamigaGfxCardSupport -+# define XamigaGfxCardSupport YES -+# endif -+# ifndef XamigaRetinaZ3Support -+# define XamigaRetinaZ3Support YES -+# endif -+# ifndef XamigaCl5426Server -+# define XamigaCl5426Server YES -+# endif -+# ifndef XamigaCV64Support -+# define XamigaCV64Support YES -+# endif -+/* -+ * You need XamigaGfxCardSupport if you enable XamigaCl5426Server, -+ * XamigaRetinaZ3Support or XamigaCV64Support and you can't use XamigaCCmono -+ * if you enable XamigaCCcolor. -+ * Don't change the next 10 lines !!!!!!!!! -+ */ -+# if (XamigaCl5426Server || XamigaCV64Support || XamigaRetinaZ3Support) \ -+ && !XamigaGfxCardSupport -+# undef XamigaGfxCardSupport -+# define XamigaGfxCardSupport YES -+# endif -+# if XamigaCCcolor -+# undef XamigaCCmono -+# define XamigaCCmono NO -+# endif -+#endif -+ -+/* -+ * Definitions for the NetBSD/alpha X server. -+ */ -+#if defined(AlphaArchitecture) -+# define XalphaNetBSDServer YES -+#ifndef XkbServerDefines -+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif -+#endif -+ -+/* -+ * Definitions for the NetBSD/arm32 VIDC20 X server. -+ */ -+#if defined(arm32Architecture) -+# define Xarm32VIDCServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/x68k X server. -+ */ -+#if defined(x68kArchitecture) -+# define X68kServer YES - #endif - - /* -- * Definition for compiling on Alpha machines -+ * Definitions for the NetBSD/macppc X server. - */ --#ifdef AlphaArchitecture --#define BuildServer NO -+#if defined(macppcArchitecture) -+# define XmacppcServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/pmax X server. -+ */ -+#if defined(pmaxArchitecture) -+# define XpmaxServer YES -+#endif -+ -+/* -+ * Definitions for the NetBSD/hpcmips X server. -+ */ -+#if defined(hpcmipsArchitecture) -+# define XhpcServer YES -+#endif -+ -+ -+#ifndef BuildScreenSaverLibrary -+#define BuildScreenSaverLibrary YES -+#endif -+ -+#ifndef XkbServerDefines -+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -+#endif -+ -+/* -+ * We use rgb.txt with XFree86, so we must use it here to be compatible. -+ */ -+#ifndef UseRgbTxt -+#define UseRgbTxt YES - #endif diff --git a/x11/openmotif/patches/patch-aq b/x11/openmotif/patches/patch-aq deleted file mode 100644 index 82423728ce8..00000000000 --- a/x11/openmotif/patches/patch-aq +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2001/12/01 02:00:43 dmcmahill Exp $ - ---- 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 @@ - 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 \ diff --git a/x11/openmotif/patches/patch-ar b/x11/openmotif/patches/patch-ar deleted file mode 100644 index a4003549d46..00000000000 --- a/x11/openmotif/patches/patch-ar +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-ar,v 1.4 2005/08/15 19:17:22 erh Exp $ - ---- config/imake/imakemdep.h.orig 2005-05-16 17:00:00.000000000 +0200 -+++ config/imake/imakemdep.h 2005-05-16 17:04:32.000000000 +0200 -@@ -265,10 +265,10 @@ - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__386BSD__) || defined(__OpenBSD__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) - #define USE_CC_E - #endif - #if defined(__sgi) && defined(__ANSI_CPP__) -@@ -326,7 +326,7 @@ - "-Uunix", /* remove unix symbol so that filename unix.c okay */ - #endif - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__APPLE__) || defined(__DragonFly__) - # ifdef __i386__ - "-D__i386__", - # endif -@@ -336,6 +336,9 @@ - # ifdef __m68k__ - "-D__m68k__", - # endif -+# ifdef __ppc__ -+ "-D__ppc__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif -@@ -662,14 +665,14 @@ - # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" - # define DEFAULT_OS_TEENY_REV "v %[0-9]" - /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ --#elif defined(__FreeBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - /* BSD/OS too? */ - /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ - # define DEFAULT_OS_MAJOR_REV "r %[0-9]" - # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" - # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" - # define DEFAULT_OS_NAME "srm %[^\n]" --# if defined(__FreeBSD__) -+# if defined(__FreeBSD__) || defined(__DragonFly__) - /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ - # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ - do { \ -@@ -968,7 +971,9 @@ - #ifdef __sgi - {"__sgi", "1"}, - #endif --#ifdef __FreeBSD__ -+#ifdef __DragonFly__ -+ {"__DragonFly__", "1"}, -+#elif defined(__FreeBSD__) - {"__FreeBSD__", "1"}, - #endif - #ifdef __OpenBSD__ -@@ -989,6 +994,12 @@ - #ifdef __QNXNTO__ - {"__QNXNTO__", "1"}, - #endif -+#ifdef __ppc__ -+ {"__ppc__", "1"}, -+#endif -+#ifdef __BIG_ENDIAN__ -+ {"__BIG_ENDIAN__", "1"}, -+#endif - /* add any additional symbols before this line */ - {NULL, NULL} - }; diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as deleted file mode 100644 index adb58dfed66..00000000000 --- a/x11/openmotif/patches/patch-as +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-as,v 1.4 2005/06/27 14:08:15 wiz Exp $ - ---- config/cf/Imake.cf.orig Sat Mar 13 21:19:59 2004 -+++ config/cf/Imake.cf -@@ -73,6 +73,9 @@ - # if defined(__sparc__) || defined(sparc) - # define SparcArchitecture - # undef sparc -+# if defined(__sparc64__) -+# define Sparc64Architecture -+# endif - # endif - # ifdef mips - # define MipsArchitecture -@@ -129,6 +132,9 @@ - # if defined(__sparc__) || defined(sparc) - # define SparcArchitecture - # undef sparc -+# if defined(__sparc64__) -+# define Sparc64Architecture -+# endif - # endif - # ifdef mips - # define MipsArchitecture -@@ -150,7 +155,21 @@ - # endif - #endif /* NetBSD */ - --#ifdef __FreeBSD__ -+#ifdef __DragonFly__ -+# define MacroIncludeFile <DragonFly.cf> -+# define MacroFile DragonFly.cf -+# undef __DragonFly__ -+# ifdef __i386__ -+# define i386BsdArchitecture -+# define i386Architecture -+# undef i386 -+# endif -+# ifdef __amd64__ -+# define AMD64Architecture -+# undef __amd64__ -+# undef __x86_64__ -+# endif -+#elif defined __FreeBSD__ - # define MacroIncludeFile <FreeBSD.cf> - # define MacroFile FreeBSD.cf - # undef __FreeBSD__ -@@ -721,6 +743,21 @@ - #endif - #endif /* QNX/Neutrino */ - -+#if defined(__APPLE__) -+# undef __APPLE__ -+# define MacroIncludeFile <darwin.cf> -+# define MacroFile darwin.cf -+# define DarwinArchitecture -+# ifdef __ppc__ -+# define PpcDarwinArchitecture -+# undef __ppc__ -+# endif -+# ifdef __i386__ -+# define i386DarwinArchitecture -+# undef __i386__ -+# endif -+#endif -+ - #ifndef MacroIncludeFile - XCOMM WARNING: Imake.cf not configured; guessing at definitions!!! - XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. diff --git a/x11/openmotif/patches/patch-at b/x11/openmotif/patches/patch-at deleted file mode 100644 index 9da41a0df90..00000000000 --- a/x11/openmotif/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.2 2003/04/21 20:31:54 cjep Exp $ ---- lib/Xm/Imakefile.orig Mon Dec 30 08:53:49 2002 -+++ lib/Xm/Imakefile Mon Dec 30 08:54:45 2002 -@@ -78,7 +78,7 @@ - STRINGSABIOPTIONS = ToolkitStringsABIOptions - - HEADERS = ArrowB.h ArrowBG.h ArrowBGP.h ArrowBP.h \ -- BulletinB.h BulletinBP.h CacheP.h CascadeB.h \ -+ BaseClassI.h BulletinB.h BulletinBP.h CacheP.h CascadeB.h \ - CascadeBG.h CascadeBGP.h CascadeBP.h Command.h \ - CommandP.h CutPaste.h DialogS.h \ - DialogSP.h DialogSEP.h DragC.h DragCP.h \ diff --git a/x11/openmotif/patches/patch-au b/x11/openmotif/patches/patch-au deleted file mode 100644 index 8b0741d4349..00000000000 --- a/x11/openmotif/patches/patch-au +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-au,v 1.3 2003/06/13 10:55:25 cjep Exp $ ---- tools/wml/Uil.y.orig Wed May 3 05:13:06 2000 -+++ tools/wml/Uil.y Wed Jun 11 17:40:36 2003 -@@ -396,6 +396,7 @@ - | WIDE_CHARACTER { $$ = $1; $$.b_type = sym_k_wchar_string_value; } - | FONTSET { $$ = $1; $$.b_type = sym_k_fontset_value; } - | WIDGET { $$ = $1; $$.b_type = sym_k_widget_ref_value; } -+ ; - /* End for fixing CR 5888 */ - - string_table_type -@@ -1049,7 +1050,6 @@ - sar_private_error( &$$ ); - } - } -- ; - | value { $$ = $1; - if ($$.b_type != sym_k_error_value) - { -@@ -1058,10 +1058,11 @@ - sar_private_error( &$$ ); - } - } -+ ; - - non_export_value - : COLOR_TABLE LEFT_PAREN color_list RIGHT_PAREN { sar_make_color_table( &$$, &$3, &$1); } -- -+ ; - /* END HaL fix CR 5427 */ - - diff --git a/x11/openmotif/patches/patch-av b/x11/openmotif/patches/patch-av deleted file mode 100644 index 96afa00f5c4..00000000000 --- a/x11/openmotif/patches/patch-av +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-av,v 1.1 2003/05/19 19:43:17 jschauma Exp $ - ---- config/cf/linux.cf.orig Mon May 19 14:30:58 2003 -+++ config/cf/linux.cf Mon May 19 14:30:22 2003 -@@ -1,6 +1,11 @@ - XCOMM platform: $TOG: linux.cf /main/36 1997/06/16 22:21:03 kaleb $ - XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.57.2.19 1999/09/04 09:12:27 dawes Exp $ - -+#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(PREFIX)/lib -Wl,-rpath,$(X11PREFIX)/lib -+#ifndef ExtraLoadFlags -+#define ExtraLoadFlags -Wl,-rpath,$(PREFIX)/lib -Wl,-rpath,$(X11PREFIX)/lib -+#endif -+ - #ifndef LinuxElfDefault - #define LinuxElfDefault YES - #endif diff --git a/x11/openmotif/patches/patch-aw b/x11/openmotif/patches/patch-aw deleted file mode 100644 index 9d253844bcc..00000000000 --- a/x11/openmotif/patches/patch-aw +++ /dev/null @@ -1,134 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2004/08/31 03:10:16 danw Exp $ - ---- config/cf/darwin.cf.orig Sun Mar 14 11:07:29 2004 -+++ config/cf/darwin.cf -@@ -0,0 +1,129 @@ -+XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.34 2002/12/04 04:40:15 torrey Exp $ -+ -+/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */ -+ -+/* imake determines the default values by parsing uname */ -+#ifndef OSName -+#define OSName DefaultOSName -+#endif -+#ifndef OSVendor -+#define OSVendor Apple Computer, Inc. -+#endif -+#ifndef OSMajorVersion -+#define OSMajorVersion DefaultOSMajorVersion -+#endif -+#ifndef OSMinorVersion -+#define OSMinorVersion DefaultOSMinorVersion -+#endif -+#ifndef OSTeenyVersion -+#define OSTeenyVersion DefaultOSTeenyVersion -+#endif -+ -+XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) -+ -+/* -+ * Define the operating system's capabilities -+ */ -+#define HasSnprintf YES -+#define HasPutenv YES -+#define HasBSD44Sockets YES -+#define Malloc0ReturnsNull NO -+#define HasShadowPasswd NO -+#define HasUsableFileMmap YES -+#define HasZlib YES -+#ifndef HasShm -+# define HasShm YES -+#endif -+#define HasNdbm YES -+#if OSMajorVersion >= 6 -+# define HasNCurses YES -+#else -+# define HasNCurses NO -+#endif -+#ifndef HasGroff -+# define HasGroff YES -+#endif -+#ifndef HasGcc3 -+# define HasGcc3 NO -+#endif -+ -+/* Thread support */ -+#define HasPosixThreads YES -+#define SystemMTDefines -D_REENTRANT -+#if OSMajorVersion >= 6 -+# define HasThreadSafeAPI YES -+# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_UNISTDAPI -+#else -+# define HasThreadSafeAPI NO -+# define MTSafeAPIDefines -DXOS_USE_MTSAFE_NETDBAPI -+#endif -+ -+/* Libtool on Darwin always uses minor numbers */ -+#define LibtoolMinorVersions YES -+ -+/* we don't need -lm */ -+#define MathLibrary /**/ -+ -+#define TermcapLibrary -lcurses -+#define SetTtyGroup YES /* for xterm */ -+ -+/* we don't have a dbm library */ -+#define DBMLibrary /**/ -+ -+#define MkdirHierCmd mkdir -p -+ -+/* our cpp isn't in /lib/cpp and early versions don't like -undef */ -+#define CppCmd cpp -+#if HasGcc3 -+# define RawCppCmd CppCmd -undef -+#else -+# define RawCppCmd CppCmd -+#endif -+ -+/* we have a gcc compatible compiler, but its not called gcc */ -+#ifndef CcCmd -+#define CcCmd cc -+#endif -+#ifndef CplusplusCmd -+#define CplusplusCmd c++ -+#endif -+ -+/* default flags to pass to cc */ -+#ifndef DefaultCCOptions -+# define DefaultCCOptions -no-cpp-precomp -+#endif -+ -+/* flags to pass to cc when building libraries */ -+#ifndef LibraryCCOptions -+# define LibraryCCOptions DefaultCCOptions -fno-common -+#endif -+ -+#define OptimizedCDebugFlags -g -Os -+ -+/* -+ * __DARWIN__ will be used for platform specific #ifdefs that can't -+ * be handled by existing X defines. -+ * -+ * Darwin's alloca() seg faults (rather than returning NULL) on failed -+ * allocations, so we can't use it. -+ * -+ * Darwin's setlocale() doesn't work properly, so use X11's instead. -+ */ -+#define StandardDefines -D__DARWIN__ -DNO_ALLOCA -DX_LOCALE -DCSRG_BASED -+ -+#define BuildLibPathVar DYLD_LIBRARY_PATH -+ -+/* include rules to build shared libraries */ -+#include <darwinLib.rules> -+ -+/* -+ * Darwin specific Imake Config files -+ */ -+#ifndef LocalConfigFiles -+#define LocalConfigFiles \ -+ darwinLib.rules \ -+ darwinLib.tmpl -+#endif -+ -+/* include all the XFree86 rules */ -+#include <xfree86.cf> diff --git a/x11/openmotif/patches/patch-ax b/x11/openmotif/patches/patch-ax deleted file mode 100644 index 93df7aef62d..00000000000 --- a/x11/openmotif/patches/patch-ax +++ /dev/null @@ -1,201 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2004/03/16 23:59:42 danw Exp $ - ---- config/cf/darwinLib.rules.orig Sun Mar 14 11:07:29 2004 -+++ config/cf/darwinLib.rules -@@ -0,0 +1,196 @@ -+XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.4.2.1 2002/07/16 22:03:05 torrey Exp $ -+/* -+ * Darwin/Mac OS X shared library rules -+ */ -+ -+#ifndef UseElfFormat -+#define UseElfFormat NO -+#endif -+#ifndef HasSharedLibraries -+#define HasSharedLibraries YES -+#endif -+#ifndef ForceNormalLib -+#define ForceNormalLib YES -+#endif -+ -+#ifndef SharedDataSeparation -+#define SharedDataSeparation NO -+#endif -+#ifndef SharedCodeDef -+#define SharedCodeDef /**/ -+#endif -+#ifndef SharedLibraryDef -+#define SharedLibraryDef /**/ -+#endif -+#ifndef ShLibIncludeFile -+#define ShLibIncludeFile <darwinLib.tmpl> -+#endif -+#ifndef SharedLibraryLoadFlags -+#define SharedLibraryLoadFlags -dynamiclib -+#endif -+#ifndef PositionIndependentCFlags -+#define PositionIndependentCFlags -dynamic -+#endif -+#ifndef ExtraLoadFlags -+#define ExtraLoadFlags /**/ -+#endif -+ -+/* -+ * InstallSharedLibrary - generate rules to install the shared library. -+ */ -+#ifndef InstallSharedLibrary -+#define InstallSharedLibrary(libname,rev,dest) @@\ -+install:: Concat(lib,libname.rev.dylib) @@\ -+ MakeDir($(DESTDIR)dest) @@\ -+ $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ set -x; $(RM) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) && \ @@\ -+ $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) @@\ -+ @(set -x; \ @@\ -+ $(RM) Concat($(DESTDIR)dest/lib,libname.dylib); \ @@\ -+ $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)) -+#endif /* InstallSharedLibrary */ -+ -+/* -+ * SharedLibraryTarget - generate rules to create a shared library; -+ * build it into a different name so that we do not hose people by having -+ * the library gone for long periods. -+ */ -+#ifndef SharedLibraryTarget -+# ifdef UseInstalled -+# define LinkBuildSonameLibrary(lib) true -+# else -+# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ -+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -+# endif -+ -+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -+AllTarget(Concat(lib,libname.rev.dylib)) @@\ -+ @@\ -+Concat(lib,libname.rev.dylib): solist $(EXTRALIBRARYDEPS) @@\ -+ $(RM) $@~ @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ -+ set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\ -+ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ -+ LinkBuildSonameLibrary($$INSTALLNAME) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @(set -x; \ @@\ -+ $(RM) Concat(lib,libname.dylib); \ @@\ -+ $(LN) $@ Concat(lib,libname.dylib)) @@\ -+ LinkBuildLibrary($@) @@\ -+ LinkBuildLibrary(Concat(lib,libname.dylib)) @@\ -+ @@\ -+clean:: @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ -+ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) -+ -+#endif /* SharedLibraryTarget */ -+ -+/* -+ * SharedDepLibraryTarget - generate rules to create a shared library. -+ */ -+#ifndef SharedDepLibraryTarget -+# ifdef UseInstalled -+# ifndef LinkBuildSonameLibrary -+# define LinkBuildSonameLibrary(lib) true -+# endif -+# else -+# ifndef LinkBuildSonameLibrary -+# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ -+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -+# endif -+# endif -+ -+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -+AllTarget(Concat(lib,libname.rev.dylib)) @@\ -+ @@\ -+Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ -+ $(RM) $@~ @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ -+ set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\ -+ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ -+ LinkBuildSonameLibrary($$INSTALLNAME) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @(set -x; \ @@\ -+ $(RM) Concat(lib,libname.dylib); \ @@\ -+ $(LN) $@ Concat(lib,libname.dylib)) @@\ -+ LinkBuildLibrary($@) @@\ -+ LinkBuildLibrary(Concat(lib,libname.dylib)) @@\ -+ @@\ -+clean:: @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ -+ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) -+ -+#endif /* SharedDepLibraryTarget */ -+ -+/* -+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library. -+ */ -+#ifndef SharedDepCplusplusLibraryTarget -+# ifdef UseInstalled -+# ifndef LinkBuildSonameLibrary -+# define LinkBuildSonameLibrary(lib) true -+# endif -+# else -+# ifndef LinkBuildSonameLibrary -+# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ -+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -+# endif -+# endif -+ -+# define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -+AllTarget(Concat(lib,libname.rev.dylib)) @@\ -+ @@\ -+Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ -+ $(RM) $@~ @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ -+ set -x; (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\ -+ $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ -+ LinkBuildSonameLibrary($$INSTALLNAME) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @(set -x; \ @@\ -+ $(RM) Concat(lib,libname.dylib); \ @@\ -+ $(LN) $@ Concat(lib,libname.dylib)) @@\ -+ LinkBuildLibrary($@) @@\ -+ LinkBuildLibrary(Concat(lib,libname.dylib)) @@\ -+ @@\ -+clean:: @@\ -+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ -+ set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ -+ $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) -+ -+#endif /* SharedDepCplusplusLibraryTarget */ -+ -+#ifndef SharedDepModuleTarget -+#define SharedDepModuleTarget(name,deps,solist) @@\ -+AllTarget(name) @@\ -+ @@\ -+name: deps @@\ -+ $(RM) $@~ @@\ -+ $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ -+ $(RM) $@ @@\ -+ $(MV) $@~ $@ @@\ -+ @@\ -+clean:: @@\ -+ $(RM) name -+ -+#endif /* SharedDepModuleTarget */ -+ -+/* -+ * SharedLibraryDataTarget - generate rules to create shlib data file; -+ */ -+#ifndef SharedLibraryDataTarget -+#define SharedLibraryDataTarget(libname,rev,salist) -+#endif /* SharedLibraryDataTarget */ -+ -+#ifndef InstallSharedLibraryData -+#define InstallSharedLibraryData(libname,rev,dest) -+#endif /* InstallSharedLibraryData */ diff --git a/x11/openmotif/patches/patch-ay b/x11/openmotif/patches/patch-ay deleted file mode 100644 index f642fabc99f..00000000000 --- a/x11/openmotif/patches/patch-ay +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2004/03/16 23:59:42 danw Exp $ - ---- config/cf/darwinLib.tmpl.orig Sun Mar 14 11:07:29 2004 -+++ config/cf/darwinLib.tmpl -@@ -0,0 +1,56 @@ -+XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.10 2003/02/04 23:04:59 torrey Exp $ -+/* -+ * Darwin/Mac OS X shared library template -+ */ -+ -+#ifndef FixupLibReferences -+#define FixupLibReferences() @@\ -+XMULIBONLY = -lXmu @@\ -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) @@\ -+GLXLIB := $(GLXLIB) $(XPLUGIN_LIB) -+#endif -+ -+#ifndef XawClientLibs -+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) -+#endif -+ -+/* Allow for libpthread, as overridden by OS definitions */ -+#if !defined(SharedX11Reqs) -+#define SharedX11Reqs -+#endif -+ -+#ifndef FontLibSharedFreeType -+#define FontLibSharedFreeType YES -+#endif -+#if FontLibSharedFreeType -+#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) -flat_namespace -+#else -+#define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary -flat_namespace -+#endif -+ -+#define SharedGLReqs $(LDPRELIB) $(XLIB) -+#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -+#define SharedSMReqs $(LDPRELIB) $(ICELIB) -+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -+#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -+#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -+#define SharedXiReqs $(LDPRELIB) $(XLIB) -+#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -+#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -+#define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) -+#define SharedXpmReqs $(LDPRELIB) $(XLIB) -+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) -+#define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) -+#define SharedXssReqs $(LDPRELIB) $(XLIB) $(EXTENSIONLIB) $(XTOOLLIB) -+#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -flat_namespace -+#define SharedXtstReqs $(LDPRELIB) $(XLIB) -+#define SharedXvReqs $(LDPRELIB) $(XLIB) -+#define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) -+#define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB) -+#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -+#define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) -+ -+#define SharedXmReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(EXTENSIONLIB) $(XPLIB) $(XLIB) -+#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXmReqs -+#define SharedUilReqs $(LDPRELIB) $(MRESOURCELIB) $(XMLIB) SharedXmReqs diff --git a/x11/openmotif/patches/patch-az b/x11/openmotif/patches/patch-az index 7b68c12a113..dd2de9f6cc5 100644 --- a/x11/openmotif/patches/patch-az +++ b/x11/openmotif/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.1 2004/03/16 23:59:42 danw Exp $ +$NetBSD: patch-az,v 1.2 2005/12/12 19:55:41 joerg Exp $ ---- lib/Xm/Scale.c.orig Sat Mar 13 22:17:01 2004 +--- lib/Xm/Scale.c.orig 2005-12-02 18:31:33.000000000 +0100 +++ lib/Xm/Scale.c -@@ -82,6 +82,9 @@ static char rcsid[] = "$TOG: Scale.c /ma +@@ -87,6 +87,9 @@ static char rcsid[] = "$TOG: Scale.c /ma extern "C" { /* some 'locale.h' do not have prototypes (sun) */ #endif #include <X11/Xlocale.h> diff --git a/x11/openmotif/patches/patch-bh b/x11/openmotif/patches/patch-bh index 9e1a68f75e5..731321c7787 100644 --- a/x11/openmotif/patches/patch-bh +++ b/x11/openmotif/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ +$NetBSD: patch-bh,v 1.2 2005/12/12 19:55:41 joerg Exp $ --- lib/Xm/Xpmparse.c.orig 2000-04-28 16:05:21.000000000 +0100 +++ lib/Xm/Xpmparse.c 2004-12-18 00:31:35.000000000 +0000 -@@ -42,6 +42,15 @@ +@@ -47,6 +47,15 @@ #include "XpmI.h" #include <ctype.h> @@ -18,7 +18,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, unsigned int height, unsigned int ncolors, unsigned int cpp, XpmColor *colorTable, -@@ -209,7 +218,7 @@ +@@ -215,7 +224,7 @@ xpmParseValues(data, width, height, ncol unsigned int *extensions; { unsigned int l; @@ -27,7 +27,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ if (!data->format) { /* XPM 2 or 3 */ -@@ -318,10 +327,10 @@ +@@ -324,10 +333,10 @@ xpmParseColors(data, ncolors, cpp, color XpmColor **colorTablePtr; xpmHashTable *hashtable; { @@ -40,7 +40,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ char curbuf[BUFSIZ]; /* current buffer */ char **sptr, *s; XpmColor *color; -@@ -329,6 +338,8 @@ +@@ -335,6 +344,8 @@ xpmParseColors(data, ncolors, cpp, color char **defaults; int ErrorStatus; @@ -49,7 +49,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); if (!colorTable) return (XpmNoMemory); -@@ -340,6 +351,10 @@ +@@ -346,6 +357,10 @@ xpmParseColors(data, ncolors, cpp, color /* * read pixel value */ @@ -60,7 +60,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ color->string = (char *) XpmMalloc(cpp + 1); if (!color->string) { xpmFreeColorTable(colorTable, ncolors); -@@ -377,13 +392,14 @@ +@@ -383,13 +398,14 @@ xpmParseColors(data, ncolors, cpp, color } if (!lastwaskey && key < NKEYS) { /* open new key */ if (curkey) { /* flush string */ @@ -77,7 +77,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ } curkey = key + 1; /* set new key */ *curbuf = '\0'; /* reset curbuf */ -@@ -394,9 +410,9 @@ +@@ -400,9 +416,9 @@ xpmParseColors(data, ncolors, cpp, color return (XpmFileInvalid); } if (!lastwaskey) @@ -89,7 +89,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ lastwaskey = 0; } } -@@ -404,12 +420,13 @@ +@@ -410,12 +426,13 @@ xpmParseColors(data, ncolors, cpp, color xpmFreeColorTable(colorTable, ncolors); return (XpmFileInvalid); } @@ -105,7 +105,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ } } else { /* XPM 1 */ /* get to the beginning of the first string */ -@@ -422,6 +439,10 @@ +@@ -428,6 +445,10 @@ xpmParseColors(data, ncolors, cpp, color /* * read pixel value */ @@ -116,29 +116,29 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ color->string = (char *) XpmMalloc(cpp + 1); if (!color->string) { xpmFreeColorTable(colorTable, ncolors); -@@ -450,16 +471,17 @@ +@@ -456,16 +477,17 @@ xpmParseColors(data, ncolors, cpp, color *curbuf = '\0'; /* init curbuf */ - while (l = xpmNextWord(data, buf, BUFSIZ)) { + while ((l = xpmNextWord(data, buf, BUFSIZ))) { if (*curbuf != '\0') - strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ ++ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ buf[l] = '\0'; - strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ ++ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ } - s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); ++ len = strlen(curbuf) + 1; ++ s = (char *) XpmMalloc(len); if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } - strcpy(s, curbuf); -+ memcpy(s, curbuf, len); ++ memcpy(s, curbuf, len); color->c_color = s; *curbuf = '\0'; /* reset curbuf */ if (a < ncolors - 1) -@@ -484,6 +506,9 @@ +@@ -490,6 +512,9 @@ ParsePixels(data, width, height, ncolors unsigned int *iptr, *iptr2; unsigned int a, x, y; @@ -148,7 +148,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ #ifndef FOR_MSW iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); #else -@@ -507,6 +532,9 @@ +@@ -513,6 +538,9 @@ ParsePixels(data, width, height, ncolors { unsigned short colidx[256]; @@ -158,7 +158,7 @@ $NetBSD: patch-bh,v 1.1 2004/12/18 00:39:31 tron Exp $ bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -584,6 +612,9 @@ +@@ -590,6 +618,9 @@ if (cidx[f]) XpmFree(cidx[f]);} char *s; char buf[BUFSIZ]; diff --git a/x11/openmotif/patches/patch-bj b/x11/openmotif/patches/patch-bj deleted file mode 100644 index c0c38da84a9..00000000000 --- a/x11/openmotif/patches/patch-bj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bj,v 1.1 2005/06/27 14:08:15 wiz Exp $ - ---- config/imake/imake.c.orig 2004-03-04 18:45:52.000000000 +0100 -+++ config/imake/imake.c 2004-08-10 17:20:20.000000000 +0200 -@@ -145,7 +145,7 @@ - * #include INCLUDE_IMAKEFILE - * <add any global targets like 'clean' and long dependencies> - */ --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - /* This needs to be before _POSIX_SOURCE gets defined */ - # include <sys/param.h> - # include <sys/time.h> |