ports/113096: [patch] X.org manpages broken

Helge Oldach ports-x11-manpages-may07 at oldach.net
Mon May 28 17:10:04 UTC 2007


>Number:         113096
>Category:       ports
>Synopsis:       [patch] X.org manpages broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 28 17:10:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 6.2-832 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.2-832 FreeBSD 6.2-832 #0: Sun May 13 14:12:36 CEST 2007 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

X.org has some 700+ manpages that just contain a ".so <somethingelse>"
line. This breaks our catman scheme with compressed manpages, resulting
in over 700 unusable manpages. This currently applies to the following
X.org-related ports:

x11-fonts/libXfontcache
x11-toolkits/libXt
x11/bitmap
x11/libX11
x11/libXScrnSaver
x11/libXau
x11/libXevie
x11/libXext
x11/libXi
x11/libXrandr
x11/libXres
x11/libXxf86dga
x11/libXxf86misc
x11/libXxf86vm
x11/xtrap

We should use our standard MLINKS mechanism instead. The patch below
fixes it.

>How-To-Repeat:

>Fix:

--- /usr/ports/x11-fonts/libXfontcache/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11-fonts/libXfontcache/Makefile	Mon May 28 16:01:06 2007
@@ -15,11 +15,11 @@
 XORG_CAT=	lib
 USE_XORG=	fontcacheproto:both x11 xext xextproto
 
-MAN3=		FontCacheChangeCacheSettings.3 \
-		FontCacheQueryExtension.3 \
-		FontCacheQueryVersion.3 \
-		FontCacheGetCacheSettings.3 \
-		FontCacheGetCacheStatistics.3 \
-		Xfontcache.3
+MAN3=		Xfontcache.3
+MLINKS=		Xfontcache.3 FontCacheChangeCacheSettings.3 \
+		Xfontcache.3 FontCacheGetCacheSettings.3 \
+		Xfontcache.3 FontCacheGetCacheStatistics.3 \
+		Xfontcache.3 FontCacheQueryExtension.3 \
+		Xfontcache.3 FontCacheQueryVersion.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11-toolkits/libXt/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11-toolkits/libXt/Makefile	Mon May 28 16:01:42 2007
@@ -16,8 +16,7 @@
 USE_XORG=	x11 sm xproto kbproto
 
 MAN1=		makestrs.1
-MAN3=		XtNew.3 \
-		XtAddGrab.3 \
+MAN3=		XtAddGrab.3 \
 		XtAppLock.3 \
 		XtAddActions.3 \
 		XtAddCallback.3 \
@@ -123,165 +122,166 @@
 		XtStringConversionWarning.3 \
 		XtToolkitThreadInitialize.3 \
 		XtTranslateCoords.3 \
-		XtRemoveGrab.3 \
-		XtVaCreateArgsList.3 \
-		XtAddCallbacks.3 \
-		XtRemoveCallback.3 \
-		XtRemoveCallbacks.3 \
-		XtRemoveAllCallbacks.3 \
-		XtAddRawEventHandler.3 \
-		XtRemoveEventHandler.3 \
-		XtRemoveRawEventHandler.3 \
-		XtInsertEventHandler.3 \
-		XtInsertRawEventHandler.3 \
-		XtAddConverter.3 \
-		XtRemoveInput.3 \
-		XtRemoveTimeOut.3 \
-		XtRemoveWorkProc.3 \
-		XtVaAppCreateShell.3 \
-		XtAppSetErrorHandler.3 \
-		XtAppWarning.3 \
-		XtAppSetWarningHandler.3 \
-		XtAppSetErrorMsgHandler.3 \
-		XtAppSetWarningMsgHandler.3 \
-		XtAppWarningMsg.3 \
-		XtAppGetErrorDatabaseText.3 \
-		XtAppSetSelectionTimeout.3 \
-		XtAppPending.3 \
-		XtAppPeekEvent.3 \
-		XtAppProcessEvent.3 \
-		XtDispatchEvent.3 \
-		XtAppMainLoop.3 \
-		XtPending.3 \
-		XtPeekEvent.3 \
-		XtProcessEvent.3 \
-		XtMainLoop.3 \
-		XtCallCallbackList.3 \
-		XtHasCallbacks.3 \
-		XtSuperclass.3 \
-		XtIsSubclass.3 \
-		XtCheckSubclass.3 \
-		XtIsObject.3 \
-		XtIsRectObj.3 \
-		XtIsWidget.3 \
-		XtIsComposite.3 \
-		XtIsConstraint.3 \
-		XtIsShell.3 \
-		XtIsOverrideShell.3 \
-		XtIsWMShell.3 \
-		XtIsVendorShell.3 \
-		XtIsTransientShell.3 \
-		XtIsTopLevelShell.3 \
-		XtIsApplicationShell.3 \
-		XtIsSessionShell.3 \
-		XtMoveWidget.3 \
-		XtResizeWidget.3 \
-		XtDirectConvert.3 \
-		XtCallConverter.3 \
-		XtDestroyApplicationContext.3 \
-		XtWidgetToApplicationContext.3 \
-		XtToolkitInitialize.3 \
-		XtVaCreatePopupShell.3 \
-		XtVaCreateWidget.3 \
-		XtCreateManagedWidget.3 \
-		XtVaCreateManagedWidget.3 \
-		XtDestroyWidget.3 \
-		XtDisplayOfObject.3 \
-		XtScreen.3 \
-		XtScreenOfObject.3 \
-		XtWindow.3 \
-		XtWindowOfObject.3 \
-		XtOpenDisplay.3 \
-		XtCloseDisplay.3 \
-		XtDatabase.3 \
-		XtScreenDatabase.3 \
-		XtReleaseGC.3 \
-		XtGetConstraintResourceList.3 \
-		XtGetSelectionValues.3 \
-		XtVaGetSubresources.3 \
-		XtVaGetApplicationResources.3 \
-		XtMakeResizeRequest.3 \
-		XtCalloc.3 \
-		XtRealloc.3 \
-		XtFree.3 \
-		XtNewString.3 \
-		XtManageChild.3 \
-		XtUnmanageChildren.3 \
-		XtUnmanageChild.3 \
-		XtIsManaged.3 \
-		XtChangeManagedSet.3 \
-		XtSetMappedWhenManaged.3 \
-		XtUnmapWidget.3 \
-		XtWindowToWidget.3 \
-		XtOffsetOf.3 \
-		XtNumber.3 \
-		XtOwnSelectionIncremental.3 \
-		XtDisownSelection.3 \
-		XtInstallAccelerators.3 \
-		XtInstallAllAccelerators.3 \
-		XtAugmentTranslations.3 \
-		XtOverrideTranslations.3 \
-		XtUninstallTranslations.3 \
-		XtCallbackPopdown.3 \
-		MenuPopdown.3 \
-		XtPopupSpringLoaded.3 \
-		XtCallbackNone.3 \
-		XtCallbackNonexclusive.3 \
-		XtCallbackExclusive.3 \
-		MenuPopup.3 \
-		XtIsRealized.3 \
-		XtUnrealizeWidget.3 \
-		XtMergeArgLists.3 \
-		XtTranslateKeycode.3 \
-		XtRegisterCaseConverter.3 \
-		XtConvertCase.3 \
-		XtIsSensitive.3 \
-		XtVaSetValues.3 \
-		XtSetSubvalues.3 \
-		XtGetValues.3 \
-		XtVaGetValues.3 \
-		XtGetSubvalues.3 \
-		XtVaGetSubvalues.3 \
-		XtVaSetSubvalues.3 \
-		XtKeysymToKeycodeList.3 \
-		XtSetTypeConverter.3 \
-		XtRemoveActionHook.3 \
-		XtGetMultiClickTime.3 \
-		XtRemoveEventTypeHandler.3 \
-		XtRegisterExtensionSelector.3 \
-		XtSetEventDispatcher.3 \
-		XtDispatchEventToWidget.3 \
-		XtLastTimestampProcessed.3 \
-		XtNoticeSignal.3 \
-		XtRemoveSignal.3 \
-		XtAddTimeOut.3 \
-		XtAddWorkProc.3 \
-		XtRemoveBlockHook.3 \
-		XtVaAppInitialize.3 \
-		XtSessionReturnToken.3 \
-		XtSetErrorMsgHandler.3 \
-		XtSetWarningMsgHandler.3 \
-		XtWarningMsg.3 \
-		XtSetErrorHandler.3 \
-		XtWarning.3 \
-		XtSetWarningHandler.3 \
-		XtGetErrorDatabaseText.3 \
-		XtGetSelectionValuesIncremental.3 \
-		XtSetSelectionTimeout.3 \
-		XtSendSelectionRequest.3 \
-		XtCancelSelectionRequest.3 \
-		XtReleasePropertyAtom.3 \
-		XtUngrabKey.3 \
-		XtGrabKeyboard.3 \
-		XtUngrabKeyboard.3 \
-		XtGrabButton.3 \
-		XtUngrabButton.3 \
-		XtGrabPointer.3 \
-		XtUngrabPointer.3 \
-		XtUnregisterDrawable.3 \
-		XtAppGetExitFlag.3 \
-		XtAppUnlock.3 \
-		XtProcessUnlock.3 \
-		XtVaOpenApplication.3
+		XtVaCreateArgsList.3
+MLINKS=		XtPopdown.3 MenuPopdown.3 \
+		XtPopup.3 MenuPopup.3 \
+		XtAddCallback.3 XtAddCallbacks.3 \
+		XtAppAddConverter.3 XtAddConverter.3 \
+		XtAddEventHandler.3 XtAddRawEventHandler.3 \
+		XtAddInput.3 XtAddTimeOut.3 \
+		XtAddInput.3 XtAddWorkProc.3 \
+		XtAppGetErrorDatabase.3 XtAppGetErrorDatabaseText.3 \
+		XtAppSetExitFlag.3 XtAppGetExitFlag.3 \
+		XtAppNextEvent.3 XtAppMainLoop.3 \
+		XtAppNextEvent.3 XtAppPeekEvent.3 \
+		XtAppNextEvent.3 XtAppPending.3 \
+		XtAppNextEvent.3 XtAppProcessEvent.3 \
+		XtAppError.3 XtAppSetErrorHandler.3 \
+		XtAppErrorMsg.3 XtAppSetErrorMsgHandler.3 \
+		XtAppGetSelectionTimeout.3 XtAppSetSelectionTimeout.3 \
+		XtAppError.3 XtAppSetWarningHandler.3 \
+		XtAppErrorMsg.3 XtAppSetWarningMsgHandler.3 \
+		XtAppLock.3 XtAppUnlock.3 \
+		XtAppError.3 XtAppWarning.3 \
+		XtAppErrorMsg.3 XtAppWarningMsg.3 \
+		XtParseTranslationTable.3 XtAugmentTranslations.3 \
+		XtCallCallbacks.3 XtCallCallbackList.3 \
+		XtConvertAndStore.3 XtCallConverter.3 \
+		XtPopup.3 XtCallbackExclusive.3 \
+		XtPopup.3 XtCallbackNone.3 \
+		XtPopup.3 XtCallbackNonexclusive.3 \
+		XtPopdown.3 XtCallbackPopdown.3 \
+		XtMalloc.3 XtCalloc.3 \
+		XtCreateSelectionRequest.3 XtCancelSelectionRequest.3 \
+		XtManageChildren.3 XtChangeManagedSet.3 \
+		XtClass.3 XtCheckSubclass.3 \
+		XtDisplayInitialize.3 XtCloseDisplay.3 \
+		XtSetKeyTranslator.3 XtConvertCase.3 \
+		XtCreateWidget.3 XtCreateManagedWidget.3 \
+		XtDisplayInitialize.3 XtDatabase.3 \
+		XtCreateApplicationContext.3 XtDestroyApplicationContext.3 \
+		XtCreateWidget.3 XtDestroyWidget.3 \
+		XtConvert.3 XtDirectConvert.3 \
+		XtOwnSelection.3 XtDisownSelection.3 \
+		XtAppNextEvent.3 XtDispatchEvent.3 \
+		XtInsertEventTypeHandler.3 XtDispatchEventToWidget.3 \
+		XtDisplay.3 XtDisplayOfObject.3 \
+		XtMalloc.3 XtFree.3 \
+		XtGetResourceList.3 XtGetConstraintResourceList.3 \
+		XtGetErrorDatabase.3 XtGetErrorDatabaseText.3 \
+		XtSetMultiClickTime.3 XtGetMultiClickTime.3 \
+		XtGetSelectionValue.3 XtGetSelectionValues.3 \
+		XtGetSelectionValueIncremental.3 XtGetSelectionValuesIncremental.3 \
+		XtSetValues.3 XtGetSubvalues.3 \
+		XtSetValues.3 XtGetValues.3 \
+		XtGrabKey.3 XtGrabButton.3 \
+		XtGrabKey.3 XtGrabKeyboard.3 \
+		XtGrabKey.3 XtGrabPointer.3 \
+		XtCallCallbacks.3 XtHasCallbacks.3 \
+		XtAddEventHandler.3 XtInsertEventHandler.3 \
+		XtAddEventHandler.3 XtInsertRawEventHandler.3 \
+		XtParseAcceleratorTable.3 XtInstallAccelerators.3 \
+		XtParseAcceleratorTable.3 XtInstallAllAccelerators.3 \
+		XtClass.3 XtIsApplicationShell.3 \
+		XtClass.3 XtIsComposite.3 \
+		XtClass.3 XtIsConstraint.3 \
+		XtManageChildren.3 XtIsManaged.3 \
+		XtClass.3 XtIsObject.3 \
+		XtClass.3 XtIsOverrideShell.3 \
+		XtRealizeWidget.3 XtIsRealized.3 \
+		XtClass.3 XtIsRectObj.3 \
+		XtSetSensitive.3 XtIsSensitive.3 \
+		XtClass.3 XtIsSessionShell.3 \
+		XtClass.3 XtIsShell.3 \
+		XtClass.3 XtIsSubclass.3 \
+		XtClass.3 XtIsTopLevelShell.3 \
+		XtClass.3 XtIsTransientShell.3 \
+		XtClass.3 XtIsVendorShell.3 \
+		XtClass.3 XtIsWMShell.3 \
+		XtClass.3 XtIsWidget.3 \
+		XtGetKeysymTable.3 XtKeysymToKeycodeList.3 \
+		XtLastEventProcessed.3 XtLastTimestampProcessed.3 \
+		XtNextEvent.3 XtMainLoop.3 \
+		XtMakeGeometryRequest.3 XtMakeResizeRequest.3 \
+		XtManageChildren.3 XtManageChild.3 \
+		XtSetArg.3 XtMergeArgLists.3 \
+		XtConfigureWidget.3 XtMoveWidget.3 \
+		XtMalloc.3 XtNew.3 \
+		XtMalloc.3 XtNewString.3 \
+		XtAppAddSignal.3 XtNoticeSignal.3 \
+		XtOffset.3 XtNumber.3 \
+		XtOffset.3 XtOffsetOf.3 \
+		XtDisplayInitialize.3 XtOpenDisplay.3 \
+		XtParseTranslationTable.3 XtOverrideTranslations.3 \
+		XtOwnSelection.3 XtOwnSelectionIncremental.3 \
+		XtNextEvent.3 XtPeekEvent.3 \
+		XtNextEvent.3 XtPending.3 \
+		XtPopup.3 XtPopupSpringLoaded.3 \
+		XtNextEvent.3 XtProcessEvent.3 \
+		XtProcessLock.3 XtProcessUnlock.3 \
+		XtMalloc.3 XtRealloc.3 \
+		XtSetKeyTranslator.3 XtRegisterCaseConverter.3 \
+		XtInsertEventTypeHandler.3 XtRegisterExtensionSelector.3 \
+		XtGetGC.3 XtReleaseGC.3 \
+		XtReservePropertyAtom.3 XtReleasePropertyAtom.3 \
+		XtAppAddActionHook.3 XtRemoveActionHook.3 \
+		XtAddCallback.3 XtRemoveAllCallbacks.3 \
+		XtAppAddBlockHook.3 XtRemoveBlockHook.3 \
+		XtAddCallback.3 XtRemoveCallback.3 \
+		XtAddCallback.3 XtRemoveCallbacks.3 \
+		XtAddEventHandler.3 XtRemoveEventHandler.3 \
+		XtInsertEventTypeHandler.3 XtRemoveEventTypeHandler.3 \
+		XtAddGrab.3 XtRemoveGrab.3 \
+		XtAppAddInput.3 XtRemoveInput.3 \
+		XtAddEventHandler.3 XtRemoveRawEventHandler.3 \
+		XtAppAddSignal.3 XtRemoveSignal.3 \
+		XtAppAddTimeOut.3 XtRemoveTimeOut.3 \
+		XtAppAddWorkProc.3 XtRemoveWorkProc.3 \
+		XtConfigureWidget.3 XtResizeWidget.3 \
+		XtDisplay.3 XtScreen.3 \
+		XtDisplayInitialize.3 XtScreenDatabase.3 \
+		XtDisplay.3 XtScreenOfObject.3 \
+		XtCreateSelectionRequest.3 XtSendSelectionRequest.3 \
+		XtSessionGetToken.3 XtSessionReturnToken.3 \
+		XtError.3 XtSetErrorHandler.3 \
+		XtErrorMsg.3 XtSetErrorMsgHandler.3 \
+		XtInsertEventTypeHandler.3 XtSetEventDispatcher.3 \
+		XtMapWidget.3 XtSetMappedWhenManaged.3 \
+		XtGetSelectionTimeout.3 XtSetSelectionTimeout.3 \
+		XtSetValues.3 XtSetSubvalues.3 \
+		XtAppSetTypeConverter.3 XtSetTypeConverter.3 \
+		XtError.3 XtSetWarningHandler.3 \
+		XtErrorMsg.3 XtSetWarningMsgHandler.3 \
+		XtClass.3 XtSuperclass.3 \
+		XtCreateApplicationContext.3 XtToolkitInitialize.3 \
+		XtSetKeyTranslator.3 XtTranslateKeycode.3 \
+		XtGrabKey.3 XtUngrabButton.3 \
+		XtGrabKey.3 XtUngrabKey.3 \
+		XtGrabKey.3 XtUngrabKeyboard.3 \
+		XtGrabKey.3 XtUngrabPointer.3 \
+		XtParseTranslationTable.3 XtUninstallTranslations.3 \
+		XtManageChildren.3 XtUnmanageChild.3 \
+		XtManageChildren.3 XtUnmanageChildren.3 \
+		XtMapWidget.3 XtUnmapWidget.3 \
+		XtRealizeWidget.3 XtUnrealizeWidget.3 \
+		XtRegisterDrawable.3 XtUnregisterDrawable.3 \
+		XtAppCreateShell.3 XtVaAppCreateShell.3 \
+		XtAppInitialize.3 XtVaAppInitialize.3 \
+		XtCreateWidget.3 XtVaCreateManagedWidget.3 \
+		XtCreatePopupShell.3 XtVaCreatePopupShell.3 \
+		XtCreateWidget.3 XtVaCreateWidget.3 \
+		XtGetApplicationResources.3 XtVaGetApplicationResources.3 \
+		XtGetSubresources.3 XtVaGetSubresources.3 \
+		XtSetValues.3 XtVaGetSubvalues.3 \
+		XtSetValues.3 XtVaGetValues.3 \
+		XtOpenApplication.3 XtVaOpenApplication.3 \
+		XtSetValues.3 XtVaSetSubvalues.3 \
+		XtSetValues.3 XtVaSetValues.3 \
+		XtError.3 XtWarning.3 \
+		XtErrorMsg.3 XtWarningMsg.3 \
+		XtCreateApplicationContext.3 XtWidgetToApplicationContext.3 \
+		XtDisplay.3 XtWindow.3 \
+		XtDisplay.3 XtWindowOfObject.3 \
+		XtNameToWidget.3 XtWindowToWidget.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/bitmap/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/bitmap/Makefile	Mon May 28 16:02:10 2007
@@ -14,6 +14,8 @@
 
 XORG_CAT=	app
 USE_XORG=	x11 xmu x11 xbitmaps xt xaw xbitmaps
-MAN1=		atobm.1 bitmap.1 bmtoa.1
+MAN1=		bitmap.1 
+MLINKS=		bitmap.1 atobm.1 \
+		bitmap.1 bmtoa.1
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libX11/manpages.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libX11/manpages	Mon May 28 16:04:27 2007
@@ -1,265 +1,68 @@
 MAN3= \
 AllPlanes.3 \
-BitmapBitOrder.3 \
-BitmapPad.3 \
-BitmapUnit.3 \
-BlackPixel.3 \
 BlackPixelOfScreen.3 \
-CellsOfScreen.3 \
-ClientWhitePointOfCCC.3 \
-ConnectionNumber.3 \
-DefaultColormap.3 \
-DefaultColormapOfScreen.3 \
-DefaultDepth.3 \
-DefaultDepthOfScreen.3 \
-DefaultGC.3 \
-DefaultGCOfScreen.3 \
-DefaultRootWindow.3 \
-DefaultScreen.3 \
-DefaultScreenOfDisplay.3 \
-DefaultVisual.3 \
-DefaultVisualOfScreen.3 \
-DisplayCells.3 \
-DisplayHeight.3 \
-DisplayHeightMM.3 \
 DisplayOfCCC.3 \
-DisplayOfScreen.3 \
-DisplayPlanes.3 \
-DisplayString.3 \
-DisplayWidth.3 \
-DisplayWidthMM.3 \
-DoesBackingStore.3 \
-DoesSaveUnders.3 \
-EventMaskOfScreen.3 \
-HeightMMOfScreen.3 \
-HeightOfScreen.3 \
 ImageByteOrder.3 \
 IsCursorKey.3 \
-IsFunctionKey.3 \
-IsKeypadKey.3 \
-IsMiscFunctionKey.3 \
-IsModifierKey.3 \
-IsPFKey.3 \
-IsPrivateKeypadKey.3 \
-LastKnownRequestProcessed.3 \
-MaxCmapsOfScreen.3 \
-MinCmapsOfScreen.3 \
-NextRequest.3 \
-PlanesOfScreen.3 \
-ProtocolRevision.3 \
-ProtocolVersion.3 \
-QLength.3 \
-RootWindow.3 \
-RootWindowOfScreen.3 \
-ScreenCount.3 \
-ScreenNumberOfCCC.3 \
-ScreenOfDisplay.3 \
-ScreenWhitePointOfCCC.3 \
-ServerVendor.3 \
-VendorRelease.3 \
-VisualOfCCC.3 \
-WhitePixel.3 \
-WhitePixelOfScreen.3 \
-WidthMMOfScreen.3 \
-WidthOfScreen.3 \
-XActivateScreenSaver.3 \
 XAddConnectionWatch.3 \
 XAddHost.3 \
-XAddHosts.3 \
-XAddPixel.3 \
-XAddToSaveSet.3 \
 XAllocClassHint.3 \
 XAllocColor.3 \
-XAllocColorCells.3 \
-XAllocColorPlanes.3 \
 XAllocIconSize.3 \
-XAllocNamedColor.3 \
 XAllocSizeHints.3 \
 XAllocStandardColormap.3 \
 XAllocWMHints.3 \
 XAllowEvents.3 \
 XAnyEvent.3 \
-XArc.3 \
-XAutoRepeatOff.3 \
-XAutoRepeatOn.3 \
-XBaseFontNameListOfFontSet.3 \
-XBell.3 \
 XButtonEvent.3 \
-XChangeActivePointerGrab.3 \
-XChangeGC.3 \
 XChangeKeyboardControl.3 \
 XChangeKeyboardMapping.3 \
 XChangePointerControl.3 \
-XChangeProperty.3 \
 XChangeSaveSet.3 \
 XChangeWindowAttributes.3 \
-XChar2b.3 \
-XCharStruct.3 \
-XCheckIfEvent.3 \
-XCheckMaskEvent.3 \
-XCheckTypedEvent.3 \
-XCheckTypedWindowEvent.3 \
-XCheckWindowEvent.3 \
 XCirculateEvent.3 \
 XCirculateRequestEvent.3 \
-XCirculateSubwindows.3 \
-XCirculateSubwindowsDown.3 \
-XCirculateSubwindowsUp.3 \
-XClassHint.3 \
 XClearArea.3 \
-XClearWindow.3 \
 XClientMessageEvent.3 \
-XClipBox.3 \
-XCloseDisplay.3 \
-XCloseIM.3 \
-XCloseOM.3 \
-XColor.3 \
 XColormapEvent.3 \
 XConfigureEvent.3 \
 XConfigureRequestEvent.3 \
 XConfigureWindow.3 \
-XContextDependentDrawing.3 \
-XContextualDrawing.3 \
-XConvertCase.3 \
-XConvertSelection.3 \
 XCopyArea.3 \
-XCopyColormapAndFree.3 \
-XCopyGC.3 \
-XCopyPlane.3 \
-XCreateBitmapFromData.3 \
 XCreateColormap.3 \
 XCreateFontCursor.3 \
 XCreateFontSet.3 \
 XCreateGC.3 \
-XCreateGlyphCursor.3 \
 XCreateIC.3 \
-XCreateImage.3 \
 XCreateOC.3 \
 XCreatePixmap.3 \
-XCreatePixmapCursor.3 \
-XCreatePixmapFromBitmapData.3 \
 XCreateRegion.3 \
-XCreateSimpleWindow.3 \
 XCreateWindow.3 \
 XCreateWindowEvent.3 \
 XCrossingEvent.3 \
-XDefaultString.3 \
 XDefineCursor.3 \
-XDeleteContext.3 \
-XDeleteModifiermapEntry.3 \
-XDeleteProperty.3 \
-XDestroyIC.3 \
-XDestroyImage.3 \
-XDestroyOC.3 \
-XDestroyRegion.3 \
-XDestroySubwindows.3 \
 XDestroyWindow.3 \
 XDestroyWindowEvent.3 \
-XDirectionalDependentDrawing.3 \
-XDisableAccessControl.3 \
-XDisplayKeycodes.3 \
-XDisplayMotionBufferSize.3 \
-XDisplayName.3 \
-XDisplayOfIM.3 \
-XDisplayOfOM.3 \
 XDrawArc.3 \
-XDrawArcs.3 \
 XDrawImageString.3 \
-XDrawImageString16.3 \
 XDrawLine.3 \
-XDrawLines.3 \
 XDrawPoint.3 \
-XDrawPoints.3 \
 XDrawRectangle.3 \
-XDrawRectangles.3 \
-XDrawSegments.3 \
 XDrawString.3 \
-XDrawString16.3 \
 XDrawText.3 \
-XDrawText16.3 \
 XEmptyRegion.3 \
-XEnableAccessControl.3 \
-XEqualRegion.3 \
 XErrorEvent.3 \
-XEvent.3 \
-XEventsQueued.3 \
 XExposeEvent.3 \
-XExtendedMaxRequestSize.3 \
 XExtentsOfFontSet.3 \
-XFetchBuffer.3 \
-XFetchBytes.3 \
-XFetchName.3 \
-XFillArc.3 \
-XFillArcs.3 \
-XFillPolygon.3 \
 XFillRectangle.3 \
-XFillRectangles.3 \
 XFilterEvent.3 \
-XFindContext.3 \
 XFlush.3 \
 XFocusChangeEvent.3 \
-XFontProp.3 \
 XFontSetExtents.3 \
-XFontStruct.3 \
 XFontsOfFontSet.3 \
-XForceScreenSaver.3 \
 XFree.3 \
-XFreeColormap.3 \
-XFreeColors.3 \
-XFreeCursor.3 \
-XFreeExtensionList.3 \
-XFreeFont.3 \
-XFreeFontInfo.3 \
-XFreeFontNames.3 \
-XFreeFontPath.3 \
-XFreeFontSet.3 \
-XFreeGC.3 \
-XFreeModifierMap.3 \
-XFreePixmap.3 \
-XFreeStringList.3 \
-XGCValues.3 \
-XGContextFromGC.3 \
-XGetAtomName.3 \
-XGetAtomNames.3 \
-XGetClassHint.3 \
-XGetCommand.3 \
-XGetErrorDatabaseText.3 \
-XGetErrorText.3 \
-XGetFontPath.3 \
-XGetFontProperty.3 \
-XGetGCValues.3 \
-XGetGeometry.3 \
-XGetICValues.3 \
-XGetIMValues.3 \
-XGetIconName.3 \
-XGetIconSizes.3 \
-XGetImage.3 \
-XGetInputFocus.3 \
-XGetKeyboardControl.3 \
-XGetKeyboardMapping.3 \
-XGetModifierMapping.3 \
-XGetMotionEvents.3 \
-XGetOCValues.3 \
-XGetOMValues.3 \
-XGetPixel.3 \
-XGetPointerControl.3 \
-XGetPointerMapping.3 \
-XGetRGBColormaps.3 \
-XGetScreenSaver.3 \
-XGetSelectionOwner.3 \
 XSetEventQueueOwner.3 \
-XGetSubImage.3 \
-XGetTextProperty.3 \
-XGetTransientForHint.3 \
 XGetVisualInfo.3 \
-XGetWMClientMachine.3 \
-XGetWMColormapWindows.3 \
-XGetWMHints.3 \
-XGetWMIconName.3 \
-XGetWMName.3 \
-XGetWMNormalHints.3 \
-XGetWMProtocols.3 \
-XGetWMSizeHints.3 \
 XGetWindowAttributes.3 \
 XGetWindowProperty.3 \
 XGetXCBConnection.3 \
@@ -270,345 +73,542 @@
 XGrabServer.3 \
 XGraphicsExposeEvent.3 \
 XGravityEvent.3 \
-XHostAddress.3 \
-XIMOfIC.3 \
-XIconSize.3 \
 XIconifyWindow.3 \
 XIfEvent.3 \
 XInitImage.3 \
 XInitThreads.3 \
-XInsertModifiermapEntry.3 \
 XInstallColormap.3 \
 XInternAtom.3 \
-XInternAtoms.3 \
-XInternalConnectionNumbers.3 \
 XIntersectRegion.3 \
-XKeyEvent.3 \
-XKeyboardControl.3 \
-XKeycodeToKeysym.3 \
 XKeymapEvent.3 \
-XKeysymToKeycode.3 \
-XKeysymToString.3 \
-XKillClient.3 \
-XListDepths.3 \
-XListExtensions.3 \
 XListFonts.3 \
-XListFontsWithInfo.3 \
-XListHosts.3 \
-XListInstalledColormaps.3 \
-XListPixmapFormats.3 \
-XListProperties.3 \
 XLoadFont.3 \
-XLoadQueryFont.3 \
-XLocaleOfFontSet.3 \
-XLocaleOfIM.3 \
-XLocaleOfOM.3 \
-XLockDisplay.3 \
-XLookupColor.3 \
 XLookupKeysym.3 \
-XLookupString.3 \
-XLowerWindow.3 \
 XMapEvent.3 \
-XMapRaised.3 \
 XMapRequestEvent.3 \
-XMapSubwindows.3 \
 XMapWindow.3 \
-XMappingEvent.3 \
-XMaskEvent.3 \
-XMatchVisualInfo.3 \
-XMaxRequestSize.3 \
-XModifierKeymap.3 \
-XMotionEvent.3 \
-XMoveResizeWindow.3 \
-XMoveWindow.3 \
-XNewModifiermap.3 \
 XNextEvent.3 \
-XNoExposeEvent.3 \
 XNoOp.3 \
-XOMOfOC.3 \
-XOffsetRegion.3 \
 XOpenDisplay.3 \
 XOpenIM.3 \
 XOpenOM.3 \
-XParseColor.3 \
 XParseGeometry.3 \
-XPeekEvent.3 \
-XPeekIfEvent.3 \
-XPending.3 \
-XPixmapFormatValues.3 \
-XPoint.3 \
-XPointInRegion.3 \
 XPolygonRegion.3 \
-XProcessInternalConnection.3 \
 XPropertyEvent.3 \
 XPutBackEvent.3 \
 XPutImage.3 \
-XPutPixel.3 \
-XQueryBestCursor.3 \
 XQueryBestSize.3 \
-XQueryBestStipple.3 \
-XQueryBestTile.3 \
 XQueryColor.3 \
-XQueryColors.3 \
 XQueryExtension.3 \
-XQueryFont.3 \
-XQueryKeymap.3 \
 XQueryPointer.3 \
-XQueryTextExtents.3 \
-XQueryTextExtents16.3 \
 XQueryTree.3 \
 XRaiseWindow.3 \
 XReadBitmapFile.3 \
-XReadBitmapFileData.3 \
-XRebindKeysym.3 \
 XRecolorCursor.3 \
-XReconfigureWMWindow.3 \
-XRectInRegion.3 \
-XRectangle.3 \
-XRefreshKeyboardMapping.3 \
-XRegisterIMInstantiateCallback.3 \
-XRemoveConnectionWatch.3 \
-XRemoveFromSaveSet.3 \
-XRemoveHost.3 \
-XRemoveHosts.3 \
 XReparentEvent.3 \
 XReparentWindow.3 \
-XResetScreenSaver.3 \
 XResizeRequestEvent.3 \
-XResizeWindow.3 \
 XResourceManagerString.3 \
-XRestackWindows.3 \
-XRotateBuffers.3 \
-XRotateWindowProperties.3 \
 XSaveContext.3 \
-XScreenNumberOfScreen.3 \
-XScreenResourceString.3 \
-XSegment.3 \
 XSelectInput.3 \
 XSelectionClearEvent.3 \
 XSelectionEvent.3 \
 XSelectionRequestEvent.3 \
 XSendEvent.3 \
-XSetAccessControl.3 \
-XSetAfterFunction.3 \
 XSetArcMode.3 \
-XSetBackground.3 \
-XSetClassHint.3 \
-XSetClipMask.3 \
 XSetClipOrigin.3 \
-XSetClipRectangles.3 \
 XSetCloseDownMode.3 \
 XSetCommand.3 \
-XSetDashes.3 \
 XSetErrorHandler.3 \
-XSetFillRule.3 \
 XSetFillStyle.3 \
 XSetFont.3 \
 XSetFontPath.3 \
-XSetForeground.3 \
-XSetFunction.3 \
-XSetGraphicsExposure.3 \
 XSetICFocus.3 \
 XSetICValues.3 \
-XSetIMValues.3 \
-XSetIOErrorHandler.3 \
-XSetIconName.3 \
-XSetIconSizes.3 \
 XSetInputFocus.3 \
 XSetLineAttributes.3 \
-XSetLocaleModifiers.3 \
-XSetModifierMapping.3 \
-XSetOCValues.3 \
-XSetOMValues.3 \
-XSetPlaneMask.3 \
 XSetPointerMapping.3 \
-XSetRGBColormaps.3 \
-XSetRegion.3 \
 XSetScreenSaver.3 \
 XSetSelectionOwner.3 \
 XSetState.3 \
-XSetStipple.3 \
-XSetSubwindowMode.3 \
-XSetTSOrigin.3 \
 XSetTextProperty.3 \
 XSetTile.3 \
 XSetTransientForHint.3 \
 XSetWMClientMachine.3 \
 XSetWMColormapWindows.3 \
-XSetWMHints.3 \
 XSetWMIconName.3 \
 XSetWMName.3 \
-XSetWMNormalHints.3 \
 XSetWMProperties.3 \
 XSetWMProtocols.3 \
-XSetWMSizeHints.3 \
-XSetWindowAttributes.3 \
-XSetWindowBackground.3 \
-XSetWindowBackgroundPixmap.3 \
-XSetWindowBorder.3 \
-XSetWindowBorderPixmap.3 \
-XSetWindowBorderWidth.3 \
-XSetWindowColormap.3 \
-XShrinkRegion.3 \
-XSizeHints.3 \
-XStandardColormap.3 \
-XStoreBuffer.3 \
 XStoreBytes.3 \
-XStoreColor.3 \
 XStoreColors.3 \
-XStoreName.3 \
-XStoreNamedColor.3 \
 XStringListToTextProperty.3 \
 XStringToKeysym.3 \
-XSubImage.3 \
-XSubtractRegion.3 \
 XSupportsLocale.3 \
-XSync.3 \
 XSynchronize.3 \
 XTextExtents.3 \
-XTextExtents16.3 \
-XTextItem.3 \
-XTextItem16.3 \
-XTextProperty.3 \
-XTextPropertyToStringList.3 \
 XTextWidth.3 \
-XTextWidth16.3 \
-XTimeCoord.3 \
 XTranslateCoordinates.3 \
-XUndefineCursor.3 \
-XUngrabButton.3 \
-XUngrabKey.3 \
-XUngrabKeyboard.3 \
-XUngrabPointer.3 \
-XUngrabServer.3 \
-XUninstallColormap.3 \
-XUnionRectWithRegion.3 \
-XUnionRegion.3 \
-XUniqueContext.3 \
-XUnloadFont.3 \
-XUnlockDisplay.3 \
 XUnmapEvent.3 \
-XUnmapSubwindows.3 \
 XUnmapWindow.3 \
-XUnregisterIMInstantiateCallback.3 \
-XUnsetICFocus.3 \
 XVaCreateNestedList.3 \
 XVisibilityEvent.3 \
-XVisualIDFromVisual.3 \
-XVisualInfo.3 \
-XWMGeometry.3 \
-XWMHints.3 \
 XWarpPointer.3 \
-XWindowAttributes.3 \
-XWindowChanges.3 \
-XWindowEvent.3 \
-XWithdrawWindow.3 \
-XWriteBitmapFile.3 \
-XXorRegion.3 \
 XcmsAllocColor.3 \
-XcmsAllocNamedColor.3 \
 XcmsCCCOfColormap.3 \
-XcmsCIELab.3 \
 XcmsCIELabQueryMaxC.3 \
-XcmsCIELabQueryMaxL.3 \
-XcmsCIELabQueryMaxLC.3 \
-XcmsCIELabQueryMinL.3 \
-XcmsCIELuv.3 \
 XcmsCIELuvQueryMaxC.3 \
-XcmsCIELuvQueryMaxL.3 \
-XcmsCIELuvQueryMaxLC.3 \
-XcmsCIELuvQueryMinL.3 \
-XcmsCIEXYZ.3 \
-XcmsCIEuvY.3 \
-XcmsCIExyY.3 \
 XcmsColor.3 \
 XcmsConvertColors.3 \
 XcmsCreateCCC.3 \
 XcmsDefaultCCC.3 \
-XcmsFreeCCC.3 \
-XcmsLookupColor.3 \
-XcmsPad.3 \
 XcmsQueryBlack.3 \
-XcmsQueryBlue.3 \
 XcmsQueryColor.3 \
-XcmsQueryColors.3 \
-XcmsQueryGreen.3 \
-XcmsQueryRed.3 \
-XcmsQueryWhite.3 \
-XcmsRGB.3 \
-XcmsRGBi.3 \
-XcmsSetCCCOfColormap.3 \
-XcmsSetWhiteAdjustProc.3 \
 XcmsSetWhitePoint.3 \
 XcmsStoreColor.3 \
-XcmsStoreColors.3 \
-XcmsTekHVC.3 \
 XcmsTekHVCQueryMaxC.3 \
-XcmsTekHVCQueryMaxV.3 \
-XcmsTekHVCQueryMaxVC.3 \
-XcmsTekHVCQueryMaxVSamples.3 \
-XcmsTekHVCQueryMinV.3 \
 XmbDrawImageString.3 \
 XmbDrawString.3 \
 XmbDrawText.3 \
 XmbLookupString.3 \
 XmbResetIC.3 \
-XmbSetWMProperties.3 \
 XmbTextEscapement.3 \
 XmbTextExtents.3 \
 XmbTextListToTextProperty.3 \
 XmbTextPerCharExtents.3 \
-XmbTextPropertyToTextList.3 \
-XrmCombineDatabase.3 \
-XrmCombineFileDatabase.3 \
-XrmDestroyDatabase.3 \
 XrmEnumerateDatabase.3 \
-XrmGetDatabase.3 \
 XrmGetFileDatabase.3 \
 XrmGetResource.3 \
-XrmGetStringDatabase.3 \
 XrmInitialize.3 \
-XrmLocaleOfDatabase.3 \
 XrmMergeDatabases.3 \
-XrmOptionDescRec.3 \
-XrmOptionKind.3 \
-XrmParseCommand.3 \
-XrmPermStringToQuark.3 \
-XrmPutFileDatabase.3 \
-XrmPutLineResource.3 \
 XrmPutResource.3 \
-XrmPutStringResource.3 \
-XrmQGetResource.3 \
-XrmQGetSearchList.3 \
-XrmQGetSearchResource.3 \
-XrmQPutResource.3 \
-XrmQPutStringResource.3 \
-XrmQuarkToString.3 \
-XrmSetDatabase.3 \
-XrmStringToBindingQuarkList.3 \
-XrmStringToQuark.3 \
-XrmStringToQuarkList.3 \
-XrmUniqueQuark.3 \
-XrmValue.3 \
-Xutf8DrawImageString.3 \
-Xutf8DrawString.3 \
-Xutf8DrawText.3 \
-Xutf8LookupString.3 \
-Xutf8ResetIC.3 \
-Xutf8SetWMProperties.3 \
-Xutf8TextEscapement.3 \
-Xutf8TextExtents.3 \
-Xutf8TextListToTextProperty.3 \
-Xutf8TextPerCharExtents.3 \
-Xutf8TextPropertyToTextList.3 \
-XwcDrawImageString.3 \
-XwcDrawString.3 \
-XwcDrawText.3 \
-XwcFreeStringList.3 \
-XwcLookupString.3 \
-XwcResetIC.3 \
-XwcTextEscapement.3 \
-XwcTextExtents.3 \
-XwcTextListToTextProperty.3 \
-XwcTextPerCharExtents.3 \
-XwcTextPropertyToTextList.3
+XrmUniqueQuark.3
+MLINKS=		ImageByteOrder.3 BitmapBitOrder.3 \
+		ImageByteOrder.3 BitmapPad.3 \
+		ImageByteOrder.3 BitmapUnit.3 \
+		AllPlanes.3 BlackPixel.3 \
+		BlackPixelOfScreen.3 CellsOfScreen.3 \
+		DisplayOfCCC.3 ClientWhitePointOfCCC.3 \
+		AllPlanes.3 ConnectionNumber.3 \
+		AllPlanes.3 DefaultColormap.3 \
+		BlackPixelOfScreen.3 DefaultColormapOfScreen.3 \
+		AllPlanes.3 DefaultDepth.3 \
+		BlackPixelOfScreen.3 DefaultDepthOfScreen.3 \
+		AllPlanes.3 DefaultGC.3 \
+		BlackPixelOfScreen.3 DefaultGCOfScreen.3 \
+		AllPlanes.3 DefaultRootWindow.3 \
+		AllPlanes.3 DefaultScreen.3 \
+		AllPlanes.3 DefaultScreenOfDisplay.3 \
+		AllPlanes.3 DefaultVisual.3 \
+		BlackPixelOfScreen.3 DefaultVisualOfScreen.3 \
+		AllPlanes.3 DisplayCells.3 \
+		ImageByteOrder.3 DisplayHeight.3 \
+		ImageByteOrder.3 DisplayHeightMM.3 \
+		BlackPixelOfScreen.3 DisplayOfScreen.3 \
+		AllPlanes.3 DisplayPlanes.3 \
+		AllPlanes.3 DisplayString.3 \
+		ImageByteOrder.3 DisplayWidth.3 \
+		ImageByteOrder.3 DisplayWidthMM.3 \
+		BlackPixelOfScreen.3 DoesBackingStore.3 \
+		BlackPixelOfScreen.3 DoesSaveUnders.3 \
+		BlackPixelOfScreen.3 EventMaskOfScreen.3 \
+		BlackPixelOfScreen.3 HeightMMOfScreen.3 \
+		BlackPixelOfScreen.3 HeightOfScreen.3 \
+		IsCursorKey.3 IsFunctionKey.3 \
+		IsCursorKey.3 IsKeypadKey.3 \
+		IsCursorKey.3 IsMiscFunctionKey.3 \
+		IsCursorKey.3 IsModifierKey.3 \
+		IsCursorKey.3 IsPFKey.3 \
+		IsCursorKey.3 IsPrivateKeypadKey.3 \
+		AllPlanes.3 LastKnownRequestProcessed.3 \
+		BlackPixelOfScreen.3 MaxCmapsOfScreen.3 \
+		BlackPixelOfScreen.3 MinCmapsOfScreen.3 \
+		AllPlanes.3 NextRequest.3 \
+		BlackPixelOfScreen.3 PlanesOfScreen.3 \
+		AllPlanes.3 ProtocolRevision.3 \
+		AllPlanes.3 ProtocolVersion.3 \
+		AllPlanes.3 QLength.3 \
+		AllPlanes.3 RootWindow.3 \
+		BlackPixelOfScreen.3 RootWindowOfScreen.3 \
+		AllPlanes.3 ScreenCount.3 \
+		DisplayOfCCC.3 ScreenNumberOfCCC.3 \
+		AllPlanes.3 ScreenOfDisplay.3 \
+		DisplayOfCCC.3 ScreenWhitePointOfCCC.3 \
+		AllPlanes.3 ServerVendor.3 \
+		AllPlanes.3 VendorRelease.3 \
+		DisplayOfCCC.3 VisualOfCCC.3 \
+		AllPlanes.3 WhitePixel.3 \
+		BlackPixelOfScreen.3 WhitePixelOfScreen.3 \
+		BlackPixelOfScreen.3 WidthMMOfScreen.3 \
+		BlackPixelOfScreen.3 WidthOfScreen.3 \
+		XSetScreenSaver.3 XActivateScreenSaver.3 \
+		XAddHost.3 XAddHosts.3 \
+		XInitImage.3 XAddPixel.3 \
+		XChangeSaveSet.3 XAddToSaveSet.3 \
+		XAllocColor.3 XAllocColorCells.3 \
+		XAllocColor.3 XAllocColorPlanes.3 \
+		XAllocColor.3 XAllocNamedColor.3 \
+		XDrawArc.3 XArc.3 \
+		XChangeKeyboardControl.3 XAutoRepeatOff.3 \
+		XChangeKeyboardControl.3 XAutoRepeatOn.3 \
+		XFontsOfFontSet.3 XBaseFontNameListOfFontSet.3 \
+		XChangeKeyboardControl.3 XBell.3 \
+		XGrabPointer.3 XChangeActivePointerGrab.3 \
+		XCreateGC.3 XChangeGC.3 \
+		XGetWindowProperty.3 XChangeProperty.3 \
+		XLoadFont.3 XChar2b.3 \
+		XLoadFont.3 XCharStruct.3 \
+		XIfEvent.3 XCheckIfEvent.3 \
+		XNextEvent.3 XCheckMaskEvent.3 \
+		XNextEvent.3 XCheckTypedEvent.3 \
+		XNextEvent.3 XCheckTypedWindowEvent.3 \
+		XNextEvent.3 XCheckWindowEvent.3 \
+		XRaiseWindow.3 XCirculateSubwindows.3 \
+		XRaiseWindow.3 XCirculateSubwindowsDown.3 \
+		XRaiseWindow.3 XCirculateSubwindowsUp.3 \
+		XAllocClassHint.3 XClassHint.3 \
+		XClearArea.3 XClearWindow.3 \
+		XPolygonRegion.3 XClipBox.3 \
+		XOpenDisplay.3 XCloseDisplay.3 \
+		XOpenIM.3 XCloseIM.3 \
+		XOpenOM.3 XCloseOM.3 \
+		XCreateColormap.3 XColor.3 \
+		XFontsOfFontSet.3 XContextDependentDrawing.3 \
+		XFontsOfFontSet.3 XContextualDrawing.3 \
+		XStringToKeysym.3 XConvertCase.3 \
+		XSetSelectionOwner.3 XConvertSelection.3 \
+		XCreateColormap.3 XCopyColormapAndFree.3 \
+		XCreateGC.3 XCopyGC.3 \
+		XCopyArea.3 XCopyPlane.3 \
+		XReadBitmapFile.3 XCreateBitmapFromData.3 \
+		XCreateFontCursor.3 XCreateGlyphCursor.3 \
+		XInitImage.3 XCreateImage.3 \
+		XCreateFontCursor.3 XCreatePixmapCursor.3 \
+		XReadBitmapFile.3 XCreatePixmapFromBitmapData.3 \
+		XCreateWindow.3 XCreateSimpleWindow.3 \
+		XmbTextListToTextProperty.3 XDefaultString.3 \
+		XSaveContext.3 XDeleteContext.3 \
+		XChangeKeyboardMapping.3 XDeleteModifiermapEntry.3 \
+		XGetWindowProperty.3 XDeleteProperty.3 \
+		XCreateIC.3 XDestroyIC.3 \
+		XInitImage.3 XDestroyImage.3 \
+		XCreateOC.3 XDestroyOC.3 \
+		XCreateRegion.3 XDestroyRegion.3 \
+		XDestroyWindow.3 XDestroySubwindows.3 \
+		XFontsOfFontSet.3 XDirectionalDependentDrawing.3 \
+		XAddHost.3 XDisableAccessControl.3 \
+		XChangeKeyboardMapping.3 XDisplayKeycodes.3 \
+		XSendEvent.3 XDisplayMotionBufferSize.3 \
+		XSetErrorHandler.3 XDisplayName.3 \
+		XOpenIM.3 XDisplayOfIM.3 \
+		XOpenOM.3 XDisplayOfOM.3 \
+		XDrawArc.3 XDrawArcs.3 \
+		XDrawImageString.3 XDrawImageString16.3 \
+		XDrawLine.3 XDrawLines.3 \
+		XDrawPoint.3 XDrawPoints.3 \
+		XDrawRectangle.3 XDrawRectangles.3 \
+		XDrawLine.3 XDrawSegments.3 \
+		XDrawString.3 XDrawString16.3 \
+		XDrawText.3 XDrawText16.3 \
+		XAddHost.3 XEnableAccessControl.3 \
+		XEmptyRegion.3 XEqualRegion.3 \
+		XAnyEvent.3 XEvent.3 \
+		XFlush.3 XEventsQueued.3 \
+		AllPlanes.3 XExtendedMaxRequestSize.3 \
+		XStoreBytes.3 XFetchBuffer.3 \
+		XStoreBytes.3 XFetchBytes.3 \
+		XSetWMName.3 XFetchName.3 \
+		XFillRectangle.3 XFillArc.3 \
+		XFillRectangle.3 XFillArcs.3 \
+		XFillRectangle.3 XFillPolygon.3 \
+		XFillRectangle.3 XFillRectangles.3 \
+		XSaveContext.3 XFindContext.3 \
+		XLoadFont.3 XFontProp.3 \
+		XLoadFont.3 XFontStruct.3 \
+		XSetScreenSaver.3 XForceScreenSaver.3 \
+		XCreateColormap.3 XFreeColormap.3 \
+		XAllocColor.3 XFreeColors.3 \
+		XRecolorCursor.3 XFreeCursor.3 \
+		XQueryExtension.3 XFreeExtensionList.3 \
+		XLoadFont.3 XFreeFont.3 \
+		XListFonts.3 XFreeFontInfo.3 \
+		XListFonts.3 XFreeFontNames.3 \
+		XSetFontPath.3 XFreeFontPath.3 \
+		XCreateFontSet.3 XFreeFontSet.3 \
+		XCreateGC.3 XFreeGC.3 \
+		XChangeKeyboardMapping.3 XFreeModifierMap.3 \
+		XCreatePixmap.3 XFreePixmap.3 \
+		XStringListToTextProperty.3 XFreeStringList.3 \
+		XCreateGC.3 XGCValues.3 \
+		XCreateGC.3 XGContextFromGC.3 \
+		XInternAtom.3 XGetAtomName.3 \
+		XInternAtom.3 XGetAtomNames.3 \
+		XAllocClassHint.3 XGetClassHint.3 \
+		XSetCommand.3 XGetCommand.3 \
+		XSetErrorHandler.3 XGetErrorDatabaseText.3 \
+		XSetErrorHandler.3 XGetErrorText.3 \
+		XSetFontPath.3 XGetFontPath.3 \
+		XLoadFont.3 XGetFontProperty.3 \
+		XCreateGC.3 XGetGCValues.3 \
+		XGetWindowAttributes.3 XGetGeometry.3 \
+		XSetICValues.3 XGetICValues.3 \
+		XOpenIM.3 XGetIMValues.3 \
+		XSetWMIconName.3 XGetIconName.3 \
+		XAllocIconSize.3 XGetIconSizes.3 \
+		XPutImage.3 XGetImage.3 \
+		XSetInputFocus.3 XGetInputFocus.3 \
+		XChangeKeyboardControl.3 XGetKeyboardControl.3 \
+		XChangeKeyboardMapping.3 XGetKeyboardMapping.3 \
+		XChangeKeyboardMapping.3 XGetModifierMapping.3 \
+		XSendEvent.3 XGetMotionEvents.3 \
+		XCreateOC.3 XGetOCValues.3 \
+		XOpenOM.3 XGetOMValues.3 \
+		XInitImage.3 XGetPixel.3 \
+		XChangePointerControl.3 XGetPointerControl.3 \
+		XSetPointerMapping.3 XGetPointerMapping.3 \
+		XAllocStandardColormap.3 XGetRGBColormaps.3 \
+		XSetScreenSaver.3 XGetScreenSaver.3 \
+		XSetSelectionOwner.3 XGetSelectionOwner.3 \
+		XPutImage.3 XGetSubImage.3 \
+		XSetTextProperty.3 XGetTextProperty.3 \
+		XSetTransientForHint.3 XGetTransientForHint.3 \
+		XSetWMClientMachine.3 XGetWMClientMachine.3 \
+		XSetWMColormapWindows.3 XGetWMColormapWindows.3 \
+		XAllocWMHints.3 XGetWMHints.3 \
+		XSetWMIconName.3 XGetWMIconName.3 \
+		XSetWMName.3 XGetWMName.3 \
+		XAllocSizeHints.3 XGetWMNormalHints.3 \
+		XSetWMProtocols.3 XGetWMProtocols.3 \
+		XAllocSizeHints.3 XGetWMSizeHints.3 \
+		XAddHost.3 XHostAddress.3 \
+		XCreateIC.3 XIMOfIC.3 \
+		XAllocIconSize.3 XIconSize.3 \
+		XChangeKeyboardMapping.3 XInsertModifiermapEntry.3 \
+		XInternAtom.3 XInternAtoms.3 \
+		XAddConnectionWatch.3 XInternalConnectionNumbers.3 \
+		XButtonEvent.3 XKeyEvent.3 \
+		XChangeKeyboardControl.3 XKeyboardControl.3 \
+		XStringToKeysym.3 XKeycodeToKeysym.3 \
+		XStringToKeysym.3 XKeysymToKeycode.3 \
+		XStringToKeysym.3 XKeysymToString.3 \
+		XSetCloseDownMode.3 XKillClient.3 \
+		AllPlanes.3 XListDepths.3 \
+		XQueryExtension.3 XListExtensions.3 \
+		XListFonts.3 XListFontsWithInfo.3 \
+		XAddHost.3 XListHosts.3 \
+		XInstallColormap.3 XListInstalledColormaps.3 \
+		ImageByteOrder.3 XListPixmapFormats.3 \
+		XGetWindowProperty.3 XListProperties.3 \
+		XLoadFont.3 XLoadQueryFont.3 \
+		XFontsOfFontSet.3 XLocaleOfFontSet.3 \
+		XOpenIM.3 XLocaleOfIM.3 \
+		XOpenOM.3 XLocaleOfOM.3 \
+		XInitThreads.3 XLockDisplay.3 \
+		XQueryColor.3 XLookupColor.3 \
+		XLookupKeysym.3 XLookupString.3 \
+		XRaiseWindow.3 XLowerWindow.3 \
+		XMapWindow.3 XMapRaised.3 \
+		XMapWindow.3 XMapSubwindows.3 \
+		XMapEvent.3 XMappingEvent.3 \
+		XNextEvent.3 XMaskEvent.3 \
+		XGetVisualInfo.3 XMatchVisualInfo.3 \
+		AllPlanes.3 XMaxRequestSize.3 \
+		XChangeKeyboardMapping.3 XModifierKeymap.3 \
+		XButtonEvent.3 XMotionEvent.3 \
+		XConfigureWindow.3 XMoveResizeWindow.3 \
+		XConfigureWindow.3 XMoveWindow.3 \
+		XChangeKeyboardMapping.3 XNewModifiermap.3 \
+		XGraphicsExposeEvent.3 XNoExposeEvent.3 \
+		XCreateOC.3 XOMOfOC.3 \
+		XIntersectRegion.3 XOffsetRegion.3 \
+		XQueryColor.3 XParseColor.3 \
+		XNextEvent.3 XPeekEvent.3 \
+		XIfEvent.3 XPeekIfEvent.3 \
+		XFlush.3 XPending.3 \
+		ImageByteOrder.3 XPixmapFormatValues.3 \
+		XDrawPoint.3 XPoint.3 \
+		XEmptyRegion.3 XPointInRegion.3 \
+		XAddConnectionWatch.3 XProcessInternalConnection.3 \
+		XInitImage.3 XPutPixel.3 \
+		XRecolorCursor.3 XQueryBestCursor.3 \
+		XQueryBestSize.3 XQueryBestStipple.3 \
+		XQueryBestSize.3 XQueryBestTile.3 \
+		XQueryColor.3 XQueryColors.3 \
+		XLoadFont.3 XQueryFont.3 \
+		XChangeKeyboardControl.3 XQueryKeymap.3 \
+		XTextExtents.3 XQueryTextExtents.3 \
+		XTextExtents.3 XQueryTextExtents16.3 \
+		XReadBitmapFile.3 XReadBitmapFileData.3 \
+		XLookupKeysym.3 XRebindKeysym.3 \
+		XIconifyWindow.3 XReconfigureWMWindow.3 \
+		XEmptyRegion.3 XRectInRegion.3 \
+		XDrawRectangle.3 XRectangle.3 \
+		XLookupKeysym.3 XRefreshKeyboardMapping.3 \
+		XOpenIM.3 XRegisterIMInstantiateCallback.3 \
+		XAddConnectionWatch.3 XRemoveConnectionWatch.3 \
+		XChangeSaveSet.3 XRemoveFromSaveSet.3 \
+		XAddHost.3 XRemoveHost.3 \
+		XAddHost.3 XRemoveHosts.3 \
+		XSetScreenSaver.3 XResetScreenSaver.3 \
+		XConfigureWindow.3 XResizeWindow.3 \
+		XRaiseWindow.3 XRestackWindows.3 \
+		XStoreBytes.3 XRotateBuffers.3 \
+		XGetWindowProperty.3 XRotateWindowProperties.3 \
+		BlackPixelOfScreen.3 XScreenNumberOfScreen.3 \
+		XResourceManagerString.3 XScreenResourceString.3 \
+		XDrawLine.3 XSegment.3 \
+		XAddHost.3 XSetAccessControl.3 \
+		XSynchronize.3 XSetAfterFunction.3 \
+		XSetState.3 XSetBackground.3 \
+		XAllocClassHint.3 XSetClassHint.3 \
+		XSetClipOrigin.3 XSetClipMask.3 \
+		XSetClipOrigin.3 XSetClipRectangles.3 \
+		XSetLineAttributes.3 XSetDashes.3 \
+		XSetFillStyle.3 XSetFillRule.3 \
+		XSetState.3 XSetForeground.3 \
+		XSetState.3 XSetFunction.3 \
+		XSetArcMode.3 XSetGraphicsExposure.3 \
+		XOpenIM.3 XSetIMValues.3 \
+		XSetErrorHandler.3 XSetIOErrorHandler.3 \
+		XSetWMIconName.3 XSetIconName.3 \
+		XAllocIconSize.3 XSetIconSizes.3 \
+		XSupportsLocale.3 XSetLocaleModifiers.3 \
+		XChangeKeyboardMapping.3 XSetModifierMapping.3 \
+		XCreateOC.3 XSetOCValues.3 \
+		XOpenOM.3 XSetOMValues.3 \
+		XSetState.3 XSetPlaneMask.3 \
+		XAllocStandardColormap.3 XSetRGBColormaps.3 \
+		XCreateRegion.3 XSetRegion.3 \
+		XSetTile.3 XSetStipple.3 \
+		XSetArcMode.3 XSetSubwindowMode.3 \
+		XSetTile.3 XSetTSOrigin.3 \
+		XAllocWMHints.3 XSetWMHints.3 \
+		XAllocSizeHints.3 XSetWMNormalHints.3 \
+		XAllocSizeHints.3 XSetWMSizeHints.3 \
+		XCreateWindow.3 XSetWindowAttributes.3 \
+		XChangeWindowAttributes.3 XSetWindowBackground.3 \
+		XChangeWindowAttributes.3 XSetWindowBackgroundPixmap.3 \
+		XChangeWindowAttributes.3 XSetWindowBorder.3 \
+		XChangeWindowAttributes.3 XSetWindowBorderPixmap.3 \
+		XConfigureWindow.3 XSetWindowBorderWidth.3 \
+		XChangeWindowAttributes.3 XSetWindowColormap.3 \
+		XIntersectRegion.3 XShrinkRegion.3 \
+		XAllocSizeHints.3 XSizeHints.3 \
+		XAllocStandardColormap.3 XStandardColormap.3 \
+		XStoreBytes.3 XStoreBuffer.3 \
+		XStoreColors.3 XStoreColor.3 \
+		XSetWMName.3 XStoreName.3 \
+		XStoreColors.3 XStoreNamedColor.3 \
+		XInitImage.3 XSubImage.3 \
+		XIntersectRegion.3 XSubtractRegion.3 \
+		XFlush.3 XSync.3 \
+		XTextExtents.3 XTextExtents16.3 \
+		XDrawText.3 XTextItem.3 \
+		XDrawText.3 XTextItem16.3 \
+		XStringListToTextProperty.3 XTextProperty.3 \
+		XStringListToTextProperty.3 XTextPropertyToStringList.3 \
+		XTextWidth.3 XTextWidth16.3 \
+		XSendEvent.3 XTimeCoord.3 \
+		XDefineCursor.3 XUndefineCursor.3 \
+		XGrabButton.3 XUngrabButton.3 \
+		XGrabKey.3 XUngrabKey.3 \
+		XGrabKeyboard.3 XUngrabKeyboard.3 \
+		XGrabPointer.3 XUngrabPointer.3 \
+		XGrabServer.3 XUngrabServer.3 \
+		XInstallColormap.3 XUninstallColormap.3 \
+		XIntersectRegion.3 XUnionRectWithRegion.3 \
+		XIntersectRegion.3 XUnionRegion.3 \
+		XSaveContext.3 XUniqueContext.3 \
+		XLoadFont.3 XUnloadFont.3 \
+		XInitThreads.3 XUnlockDisplay.3 \
+		XUnmapWindow.3 XUnmapSubwindows.3 \
+		XOpenIM.3 XUnregisterIMInstantiateCallback.3 \
+		XSetICFocus.3 XUnsetICFocus.3 \
+		XGetVisualInfo.3 XVisualIDFromVisual.3 \
+		XGetVisualInfo.3 XVisualInfo.3 \
+		XParseGeometry.3 XWMGeometry.3 \
+		XAllocWMHints.3 XWMHints.3 \
+		XGetWindowAttributes.3 XWindowAttributes.3 \
+		XConfigureWindow.3 XWindowChanges.3 \
+		XNextEvent.3 XWindowEvent.3 \
+		XIconifyWindow.3 XWithdrawWindow.3 \
+		XReadBitmapFile.3 XWriteBitmapFile.3 \
+		XIntersectRegion.3 XXorRegion.3 \
+		XcmsAllocColor.3 XcmsAllocNamedColor.3 \
+		XcmsColor.3 XcmsCIELab.3 \
+		XcmsCIELabQueryMaxC.3 XcmsCIELabQueryMaxL.3 \
+		XcmsCIELabQueryMaxC.3 XcmsCIELabQueryMaxLC.3 \
+		XcmsCIELabQueryMaxC.3 XcmsCIELabQueryMinL.3 \
+		XcmsColor.3 XcmsCIELuv.3 \
+		XcmsCIELuvQueryMaxC.3 XcmsCIELuvQueryMaxL.3 \
+		XcmsCIELuvQueryMaxC.3 XcmsCIELuvQueryMaxLC.3 \
+		XcmsCIELuvQueryMaxC.3 XcmsCIELuvQueryMinL.3 \
+		XcmsColor.3 XcmsCIEXYZ.3 \
+		XcmsColor.3 XcmsCIEuvY.3 \
+		XcmsColor.3 XcmsCIExyY.3 \
+		XcmsCreateCCC.3 XcmsFreeCCC.3 \
+		XcmsQueryColor.3 XcmsLookupColor.3 \
+		XcmsColor.3 XcmsPad.3 \
+		XcmsQueryBlack.3 XcmsQueryBlue.3 \
+		XcmsQueryColor.3 XcmsQueryColors.3 \
+		XcmsQueryBlack.3 XcmsQueryGreen.3 \
+		XcmsQueryBlack.3 XcmsQueryRed.3 \
+		XcmsQueryBlack.3 XcmsQueryWhite.3 \
+		XcmsColor.3 XcmsRGB.3 \
+		XcmsColor.3 XcmsRGBi.3 \
+		XcmsCCCOfColormap.3 XcmsSetCCCOfColormap.3 \
+		XcmsSetWhitePoint.3 XcmsSetWhiteAdjustProc.3 \
+		XcmsStoreColor.3 XcmsStoreColors.3 \
+		XcmsColor.3 XcmsTekHVC.3 \
+		XcmsTekHVCQueryMaxC.3 XcmsTekHVCQueryMaxV.3 \
+		XcmsTekHVCQueryMaxC.3 XcmsTekHVCQueryMaxVC.3 \
+		XcmsTekHVCQueryMaxC.3 XcmsTekHVCQueryMaxVSamples.3 \
+		XcmsTekHVCQueryMaxC.3 XcmsTekHVCQueryMinV.3 \
+		XSetWMProperties.3 XmbSetWMProperties.3 \
+		XmbTextListToTextProperty.3 XmbTextPropertyToTextList.3 \
+		XrmMergeDatabases.3 XrmCombineDatabase.3 \
+		XrmMergeDatabases.3 XrmCombineFileDatabase.3 \
+		XrmGetFileDatabase.3 XrmDestroyDatabase.3 \
+		XrmGetFileDatabase.3 XrmGetDatabase.3 \
+		XrmGetFileDatabase.3 XrmGetStringDatabase.3 \
+		XrmGetFileDatabase.3 XrmLocaleOfDatabase.3 \
+		XrmInitialize.3 XrmOptionDescRec.3 \
+		XrmInitialize.3 XrmOptionKind.3 \
+		XrmInitialize.3 XrmParseCommand.3 \
+		XrmUniqueQuark.3 XrmPermStringToQuark.3 \
+		XrmGetFileDatabase.3 XrmPutFileDatabase.3 \
+		XrmPutResource.3 XrmPutLineResource.3 \
+		XrmPutResource.3 XrmPutStringResource.3 \
+		XrmGetResource.3 XrmQGetResource.3 \
+		XrmGetResource.3 XrmQGetSearchList.3 \
+		XrmGetResource.3 XrmQGetSearchResource.3 \
+		XrmPutResource.3 XrmQPutResource.3 \
+		XrmPutResource.3 XrmQPutStringResource.3 \
+		XrmUniqueQuark.3 XrmQuarkToString.3 \
+		XrmGetFileDatabase.3 XrmSetDatabase.3 \
+		XrmUniqueQuark.3 XrmStringToBindingQuarkList.3 \
+		XrmUniqueQuark.3 XrmStringToQuark.3 \
+		XrmUniqueQuark.3 XrmStringToQuarkList.3 \
+		XrmInitialize.3 XrmValue.3 \
+		XmbDrawImageString.3 Xutf8DrawImageString.3 \
+		XmbDrawString.3 Xutf8DrawString.3 \
+		XmbDrawText.3 Xutf8DrawText.3 \
+		XmbLookupString.3 Xutf8LookupString.3 \
+		XmbResetIC.3 Xutf8ResetIC.3 \
+		XSetWMProperties.3 Xutf8SetWMProperties.3 \
+		XmbTextEscapement.3 Xutf8TextEscapement.3 \
+		XmbTextExtents.3 Xutf8TextExtents.3 \
+		XmbTextListToTextProperty.3 Xutf8TextListToTextProperty.3 \
+		XmbTextPerCharExtents.3 Xutf8TextPerCharExtents.3 \
+		XmbTextListToTextProperty.3 Xutf8TextPropertyToTextList.3 \
+		XmbDrawImageString.3 XwcDrawImageString.3 \
+		XmbDrawString.3 XwcDrawString.3 \
+		XmbDrawText.3 XwcDrawText.3 \
+		XmbTextListToTextProperty.3 XwcFreeStringList.3 \
+		XmbLookupString.3 XwcLookupString.3 \
+		XmbResetIC.3 XwcResetIC.3 \
+		XmbTextEscapement.3 XwcTextEscapement.3 \
+		XmbTextExtents.3 XwcTextExtents.3 \
+		XmbTextListToTextProperty.3 XwcTextListToTextProperty.3 \
+		XmbTextPerCharExtents.3 XwcTextPerCharExtents.3 \
+		XmbTextListToTextProperty.3 XwcTextPropertyToTextList.3
--- /usr/ports/x11/libXScrnSaver/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXScrnSaver/Makefile	Mon May 28 16:05:25 2007
@@ -15,17 +15,17 @@
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto scrnsaverproto:both
 
-MAN3=		Xss.3 \
-		XScreenSaverAllocInfo.3 \
-		XScreenSaverGetRegistered.3 \
-		XScreenSaverQueryExtension.3 \
-		XScreenSaverQueryInfo.3 \
-		XScreenSaverQueryVersion.3 \
-		XScreenSaverRegister.3 \
-		XScreenSaverSelectInput.3 \
-		XScreenSaverSetAttributes.3 \
-		XScreenSaverSuspend.3 \
-		XScreenSaverUnregister.3 \
-		XScreenSaverUnsetAttributes.3
+MAN3=		Xss.3
+MLINKS=		Xss.3 XScreenSaverAllocInfo.3 \
+		Xss.3 XScreenSaverGetRegistered.3 \
+		Xss.3 XScreenSaverQueryExtension.3 \
+		Xss.3 XScreenSaverQueryInfo.3 \
+		Xss.3 XScreenSaverQueryVersion.3 \
+		Xss.3 XScreenSaverRegister.3 \
+		Xss.3 XScreenSaverSelectInput.3 \
+		Xss.3 XScreenSaverSetAttributes.3 \
+		Xss.3 XScreenSaverSuspend.3 \
+		Xss.3 XScreenSaverUnregister.3 \
+		Xss.3 XScreenSaverUnsetAttributes.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXau/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXau/Makefile	Mon May 28 16:05:45 2007
@@ -16,9 +16,15 @@
 XORG_CAT=	lib
 USE_XORG=	xproto:both
 
-MAN3=		Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
-		XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
-		XauUnlockAuth.3 XauWriteAuth.3
+MAN3=		Xau.3
+MLINKS=		Xau.3 XauDisposeAuth.3 \
+		Xau.3 XauFileName.3 \
+		Xau.3 XauGetAuthByAddr.3 \
+		Xau.3 XauGetBestAuthByAddr.3 \
+		Xau.3 XauLockAuth.3 \
+		Xau.3 XauReadAuth.3 \
+		Xau.3 XauUnlockAuth.3 \
+		Xau.3 XauWriteAuth.3
 
 post-install:
 	${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0
--- /usr/ports/x11/libXevie/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXevie/Makefile	Mon May 28 16:05:55 2007
@@ -15,11 +15,11 @@
 XORG_CAT=	lib
 USE_XORG=	evieproto x11 xext xextproto xproto:both
 
-MAN3=		Xevie.3 \
-		XevieEnd.3 \
-		XevieQueryVersion.3 \
-		XevieSelectInput.3 \
-		XevieSendEvent.3 \
-		XevieStart.3
+MAN3=		Xevie.3
+MLINKS=		Xevie.3 XevieEnd.3 \
+		Xevie.3 XevieQueryVersion.3 \
+		Xevie.3 XevieSelectInput.3 \
+		Xevie.3 XevieSendEvent.3 \
+		Xevie.3 XevieStart.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXext/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXext/Makefile	Mon May 28 16:06:01 2007
@@ -27,17 +27,6 @@
 		DPMSQueryExtension.3 \
 		DPMSSetTimeouts.3 \
 		XShape.3 \
-		XShapeCombineMask.3 \
-		XShapeCombineRectangles.3 \
-		XShapeCombineRegion.3 \
-		XShapeCombineShape.3 \
-		XShapeGetRectangles.3 \
-		XShapeInputSelected.3 \
-		XShapeOffsetShape.3 \
-		XShapeQueryExtension.3 \
-		XShapeQueryExtents.3 \
-		XShapeQueryVersion.3 \
-		XShapeSelectInput.3 \
 		XcupGetReservedColormapEntries.3 \
 		XcupQueryVersion.3 \
 		XcupStoreColors.3 \
@@ -51,31 +40,42 @@
 		XdbeQueryExtension.3 \
 		XdbeSwapBuffers.3 \
 		Xevi.3 \
-		XeviGetVisualInfo.3 \
-		XeviQueryExtension.3 \
-		XeviQueryVersion.3 \
 		Xmbuf.3 \
-		XmbufChangeBufferAttributes.3 \
-		XmbufChangeWindowAttributes.3 \
-		XmbufCreateBuffers.3 \
-		XmbufCreateStereoWindow.3 \
-		XmbufDestroyBuffers.3 \
-		XmbufDisplayBuffers.3 \
-		XmbufGetBufferAttributes.3 \
-		XmbufGetScreenInfo.3 \
-		XmbufGetVersion.3 \
-		XmbufGetWindowAttributes.3 \
-		XmbufQueryExtension.3 \
-		XShm.3 \
-		XShmAttach.3 \
-		XShmCreateImage.3 \
-		XShmCreatePixmap.3 \
-		XShmDetach.3 \
-		XShmGetEventBase.3 \
-		XShmGetImage.3 \
-		XShmPixmapFormat.3 \
-		XShmPutImage.3 \
-		XShmQueryExtension.3 \
-		XShmQueryVersion.3
+		XShm.3
+MLINKS=		XShape.3 XShapeCombineMask.3 \
+		XShape.3 XShapeCombineRectangles.3 \
+		XShape.3 XShapeCombineRegion.3 \
+		XShape.3 XShapeCombineShape.3 \
+		XShape.3 XShapeGetRectangles.3 \
+		XShape.3 XShapeInputSelected.3 \
+		XShape.3 XShapeOffsetShape.3 \
+		XShape.3 XShapeQueryExtension.3 \
+		XShape.3 XShapeQueryExtents.3 \
+		XShape.3 XShapeQueryVersion.3 \
+		XShape.3 XShapeSelectInput.3 \
+		XShm.3 XShmAttach.3 \
+		XShm.3 XShmCreateImage.3 \
+		XShm.3 XShmCreatePixmap.3 \
+		XShm.3 XShmDetach.3 \
+		XShm.3 XShmGetEventBase.3 \
+		XShm.3 XShmGetImage.3 \
+		XShm.3 XShmPixmapFormat.3 \
+		XShm.3 XShmPutImage.3 \
+		XShm.3 XShmQueryExtension.3 \
+		XShm.3 XShmQueryVersion.3 \
+		Xevi.3 XeviGetVisualInfo.3 \
+		Xevi.3 XeviQueryExtension.3 \
+		Xevi.3 XeviQueryVersion.3 \
+		Xmbuf.3 XmbufChangeBufferAttributes.3 \
+		Xmbuf.3 XmbufChangeWindowAttributes.3 \
+		Xmbuf.3 XmbufCreateBuffers.3 \
+		Xmbuf.3 XmbufCreateStereoWindow.3 \
+		Xmbuf.3 XmbufDestroyBuffers.3 \
+		Xmbuf.3 XmbufDisplayBuffers.3 \
+		Xmbuf.3 XmbufGetBufferAttributes.3 \
+		Xmbuf.3 XmbufGetScreenInfo.3 \
+		Xmbuf.3 XmbufGetVersion.3 \
+		Xmbuf.3 XmbufGetWindowAttributes.3 \
+		Xmbuf.3 XmbufQueryExtension.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXi/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXi/Makefile	Mon May 28 16:06:17 2007
@@ -17,26 +17,16 @@
 USE_XORG=	xproto x11 xext xextproto inputproto:both
 
 MAN3=		XAllowDeviceEvents.3 \
-		XChangeDeviceControl.3 \
 		XChangeDeviceDontPropagateList.3 \
-		XChangeDeviceKeyMapping.3 \
-		XChangeFeedbackControl.3 \
 		XChangeKeyboardDevice.3 \
 		XChangePointerDevice.3 \
-		XCloseDevice.3 \
 		XDeviceBell.3 \
-		XDeviceTimeCoord.3 \
-		XFreeDeviceList.3 \
 		XGetDeviceControl.3 \
 		XGetDeviceKeyMapping.3 \
 		XGetDeviceModifierMapping.3 \
 		XGetDeviceMotionEvents.3 \
 		XGetExtensionVersion.3 \
 		XGetFeedbackControl.3 \
-		XGetDeviceButtonMapping.3 \
-		XGetDeviceDontPropagateList.3 \
-		XGetDeviceFocus.3 \
-		XGetSelectedExtensionEvents.3 \
 		XGrabDevice.3 \
 		XGrabDeviceButton.3 \
 		XGrabDeviceKey.3 \
@@ -48,10 +38,20 @@
 		XSetDeviceButtonMapping.3 \
 		XSetDeviceFocus.3 \
 		XSetDeviceMode.3 \
-		XSetDeviceModifierMapping.3 \
-		XSetDeviceValuators.3 \
-		XUngrabDeviceButton.3 \
-		XUngrabDeviceKey.3 \
-		XUngrabDevice.3 \
+		XSetDeviceValuators.3
+MLINKS=		XGetDeviceControl.3 XChangeDeviceControl.3 \
+		XGetDeviceKeyMapping.3 XChangeDeviceKeyMapping.3 \
+		XGetFeedbackControl.3 XChangeFeedbackControl.3 \
+		XOpenDevice.3 XCloseDevice.3 \
+		XGetDeviceMotionEvents.3 XDeviceTimeCoord.3 \
+		XListInputDevices.3 XFreeDeviceList.3 \
+		XSetDeviceButtonMapping.3 XGetDeviceButtonMapping.3 \
+		XChangeDeviceDontPropagateList.3 XGetDeviceDontPropagateList.3 \
+		XSetDeviceFocus.3 XGetDeviceFocus.3 \
+		XSelectExtensionEvent.3 XGetSelectedExtensionEvents.3 \
+		XGetDeviceModifierMapping.3 XSetDeviceModifierMapping.3 \
+		XGrabDevice.3 XUngrabDevice.3 \
+		XGrabDeviceButton.3 XUngrabDeviceButton.3 \
+		XGrabDeviceKey.3 XUngrabDeviceKey.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXrandr/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXrandr/Makefile	Mon May 28 16:06:22 2007
@@ -15,22 +15,22 @@
 XORG_CAT=	lib
 USE_XORG=	x11 randrproto:both xext xextproto xrender renderproto
 
-MAN3=		Xrandr.3 \
-		XRRConfig.3 \
-		XRRConfigCurrentConfiguration.3 \
-		XRRConfigCurrentRate.3 \
-		XRRConfigRates.3 \
-		XRRConfigRotations.3 \
-		XRRConfigSizes.3 \
-		XRRConfigTimes.3 \
-		XRRFreeScreenConfigInfo.3 \
-		XRRGetScreenInfo.3 \
-		XRRQueryExtension.3 \
-		XRRQueryVersion.3 \
-		XRRRootToScreen.3 \
-		XRRScreenConfig.3 \
-		XRRSelectInput.3 \
-		XRRSetScreenConfig.3 \
-		XRRSetScreenConfigAndRate.3
+MAN3=		Xrandr.3
+MLINKS=		Xrandr.3 XRRConfig.3 \
+		Xrandr.3 XRRConfigCurrentConfiguration.3 \
+		Xrandr.3 XRRConfigCurrentRate.3 \
+		Xrandr.3 XRRConfigRates.3 \
+		Xrandr.3 XRRConfigRotations.3 \
+		Xrandr.3 XRRConfigSizes.3 \
+		Xrandr.3 XRRConfigTimes.3 \
+		Xrandr.3 XRRFreeScreenConfigInfo.3 \
+		Xrandr.3 XRRGetScreenInfo.3 \
+		Xrandr.3 XRRQueryExtension.3 \
+		Xrandr.3 XRRQueryVersion.3 \
+		Xrandr.3 XRRRootToScreen.3 \
+		Xrandr.3 XRRScreenConfig.3 \
+		Xrandr.3 XRRSelectInput.3 \
+		Xrandr.3 XRRSetScreenConfig.3 \
+		Xrandr.3 XRRSetScreenConfigAndRate.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXres/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXres/Makefile	Mon May 28 16:06:27 2007
@@ -15,11 +15,11 @@
 XORG_CAT=	lib
 USE_XORG=	x11 xext xextproto resourceproto
 
-MAN3=		XRes.3 \
-		XResQueryClients.3 \
-		XResQueryClientPixmapBytes.3 \
-		XResQueryClientResources.3 \
-		XResQueryExtension.3 \
-		XResQueryVersion.3
+MAN3=		XRes.3
+MLINKS=		XRes.3 XResQueryClientPixmapBytes.3 \
+		XRes.3 XResQueryClientResources.3 \
+		XRes.3 XResQueryClients.3 \
+		XRes.3 XResQueryExtension.3 \
+		XRes.3 XResQueryVersion.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXxf86dga/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXxf86dga/Makefile	Mon May 28 16:06:32 2007
@@ -15,26 +15,26 @@
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86dgaproto:both
 
-MAN3=		XDGA.3 \
-		XDGAOpenFramebuffer.3 \
-		XDGAChangePixmapMode.3 \
-		XDGAQueryExtension.3 \
-		XDGACloseFramebuffer.3 \
-		XDGAQueryModes.3 \
-		XDGACopyArea.3 \
-		XDGAQueryVersion.3 \
-		XDGACopyTransparentArea.3 \
-		XDGASelectInput.3 \
-		XDGACreateColormap.3 \
-		XDGASetClientVersion.3 \
-		XDGAFillRectangle.3 \
-		XDGASetMode.3 \
-		XDGAGetViewportStatus.3 \
-		XDGASetViewport.3 \
-		XDGAInstallColormap.3 \
-		XDGASync.3 \
-		XDGAKeyEventToXKeyEvent.3 \
-		XF86DGA.3 \
-		XFree86-DGA.3
+MAN3=		XDGA.3
+MLINKS=		XDGA.3 XDGAChangePixmapMode.3 \
+		XDGA.3 XDGACloseFramebuffer.3 \
+		XDGA.3 XDGACopyArea.3 \
+		XDGA.3 XDGACopyTransparentArea.3 \
+		XDGA.3 XDGACreateColormap.3 \
+		XDGA.3 XDGAFillRectangle.3 \
+		XDGA.3 XDGAGetViewportStatus.3 \
+		XDGA.3 XDGAInstallColormap.3 \
+		XDGA.3 XDGAKeyEventToXKeyEvent.3 \
+		XDGA.3 XDGAOpenFramebuffer.3 \
+		XDGA.3 XDGAQueryExtension.3 \
+		XDGA.3 XDGAQueryModes.3 \
+		XDGA.3 XDGAQueryVersion.3 \
+		XDGA.3 XDGASelectInput.3 \
+		XDGA.3 XDGASetClientVersion.3 \
+		XDGA.3 XDGASetMode.3 \
+		XDGA.3 XDGASetViewport.3 \
+		XDGA.3 XDGASync.3 \
+		XDGA.3 XF86DGA.3 \
+		XDGA.3 XFree86-DGA.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXxf86misc/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXxf86misc/Makefile	Mon May 28 16:06:39 2007
@@ -15,14 +15,14 @@
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86miscproto:both
 
-MAN3=		XF86Misc.3 \
-		XF86MiscGetKbdSettings.3 \
-		XF86MiscGetMouseSettings.3 \
-		XF86MiscGetSaver.3 \
-		XF86MiscQueryExtension.3 \
-		XF86MiscQueryVersion.3 \
-		XF86MiscSetKbdSettings.3 \
-		XF86MiscSetMouseSettings.3 \
-		XF86MiscSetSaver.3
+MAN3=		XF86Misc.3
+MLINKS=		XF86Misc.3 XF86MiscGetKbdSettings.3 \
+		XF86Misc.3 XF86MiscGetMouseSettings.3 \
+		XF86Misc.3 XF86MiscGetSaver.3 \
+		XF86Misc.3 XF86MiscQueryExtension.3 \
+		XF86Misc.3 XF86MiscQueryVersion.3 \
+		XF86Misc.3 XF86MiscSetKbdSettings.3 \
+		XF86Misc.3 XF86MiscSetMouseSettings.3 \
+		XF86Misc.3 XF86MiscSetSaver.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/libXxf86vm/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/libXxf86vm/Makefile	Mon May 28 16:06:44 2007
@@ -15,27 +15,27 @@
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xextproto xext xf86vidmodeproto:both
 
-MAN3=		XF86VM.3 \
-		XF86VidModeLockModeSwitch.3 \
-		XF86VidModeDeleteModeLine.3 \
-		XF86VidModeModModeLine.3 \
-		XF86VidModeGetAllModeLines.3 \
-		XF86VidModeQueryExtension.3 \
-		XF86VidModeGetDotClocks.3 \
-		XF86VidModeQueryVersion.3 \
-		XF86VidModeGetGamma.3 \
-		XF86VidModeSetClientVersion.3 \
-		XF86VidModeGetGammaRamp.3 \
-		XF86VidModeSetGamma.3 \
-		XF86VidModeGetGammaRampSize.3 \
-		XF86VidModeSetGammaRamp.3 \
-		XF86VidModeGetModeLine.3 \
-		XF86VidModeSetViewPort.3 \
-		XF86VidModeGetMonitor.3 \
-		XF86VidModeSwitchMode.3 \
-		XF86VidModeGetPermissions.3 \
-		XF86VidModeSwitchToMode.3 \
-		XF86VidModeGetViewPort.3 \
-		XF86VidModeValidateModeLine.3
+MAN3=		XF86VM.3
+MLINKS=		XF86VM.3 XF86VidModeDeleteModeLine.3 \
+		XF86VM.3 XF86VidModeGetAllModeLines.3 \
+		XF86VM.3 XF86VidModeGetDotClocks.3 \
+		XF86VM.3 XF86VidModeGetGamma.3 \
+		XF86VM.3 XF86VidModeGetGammaRamp.3 \
+		XF86VM.3 XF86VidModeGetGammaRampSize.3 \
+		XF86VM.3 XF86VidModeGetModeLine.3 \
+		XF86VM.3 XF86VidModeGetMonitor.3 \
+		XF86VM.3 XF86VidModeGetPermissions.3 \
+		XF86VM.3 XF86VidModeGetViewPort.3 \
+		XF86VM.3 XF86VidModeLockModeSwitch.3 \
+		XF86VM.3 XF86VidModeModModeLine.3 \
+		XF86VM.3 XF86VidModeQueryExtension.3 \
+		XF86VM.3 XF86VidModeQueryVersion.3 \
+		XF86VM.3 XF86VidModeSetClientVersion.3 \
+		XF86VM.3 XF86VidModeSetGamma.3 \
+		XF86VM.3 XF86VidModeSetGammaRamp.3 \
+		XF86VM.3 XF86VidModeSetViewPort.3 \
+		XF86VM.3 XF86VidModeSwitchMode.3 \
+		XF86VM.3 XF86VidModeSwitchToMode.3 \
+		XF86VM.3 XF86VidModeValidateModeLine.3
 
 .include <bsd.port.mk>
--- /usr/ports/x11/xtrap/Makefile.ctm	Sun May 20 09:16:38 2007
+++ /usr/ports/x11/xtrap/Makefile	Mon May 28 16:06:50 2007
@@ -15,13 +15,13 @@
 XORG_CAT=	app
 USE_XORG=	xtrap
 
-MAN1=		xtrap.1 \
-		xtrapchar.1 \
-		xtrapin.1 \
-		xtrapinfo.1 \
-		xtrapout.1 \
-		xtrapproto.1 \
-		xtrapreset.1 \
-		xtrapstats.1
+MAN1=		xtrap.1
+MLINKS=		xtrap.1 xtrapchar.1 \
+		xtrap.1 xtrapin.1 \
+		xtrap.1 xtrapinfo.1 \
+		xtrap.1 xtrapout.1 \
+		xtrap.1 xtrapproto.1 \
+		xtrap.1 xtrapreset.1 \
+		xtrap.1 xtrapstats.1
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list