12 files changed, 345 insertions, 312 deletions

diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 463a8aa9f709..3dda64cc8efd 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXaw
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
@@ -15,6 +15,7 @@ COMMENT=	X Athena Widgets library
 
 XORG_CAT=	lib
 USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
+USE_GMAKE=	yes
 
 MAN3=		Xaw.3
 
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 206a0c30b022..c4aa13012bf2 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/libXaw-1.0.7.tar.bz2) = 815e74de989ccda684e2baf8d12cf519
-SHA256 (xorg/lib/libXaw-1.0.7.tar.bz2) = 740aaee9b09586b1c80f80890381c5ee70ea11efa4b6159f707c0f3684c6f328
-SIZE (xorg/lib/libXaw-1.0.7.tar.bz2) = 598661
+SHA256 (xorg/lib/libXaw-1.0.8.tar.bz2) = 3daeab01ee702cbc4ac91f11d553710ad31d4151510386093c186a94ccd4beba
+SIZE (xorg/lib/libXaw-1.0.8.tar.bz2) = 635256
diff --git a/x11-toolkits/libXaw/pkg-descr b/x11-toolkits/libXaw/pkg-descr
index 87f058e1fc7b..827c9afcb7b7 100644
--- a/x11-toolkits/libXaw/pkg-descr
+++ b/x11-toolkits/libXaw/pkg-descr
@@ -1,6 +1,3 @@
 This package contains the X Athena Widgets library.
 
 WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index 76dc96bad22d..d8c4c79a0285 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -82,9 +82,51 @@ lib/libXaw7.so
 lib/libXaw7.so.7
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
-%%DOCSDIR%%/widgets.html
-%%DOCSDIR%%/widgets.index.ps
-%%DOCSDIR%%/widgets.ps
-%%DOCSDIR%%/widgets.txt
+%%DOCSDIR%%/AsciiSink.xml
+%%DOCSDIR%%/AsciiSource.xml
+%%DOCSDIR%%/AsciiText.xml
+%%DOCSDIR%%/Box.xml
+%%DOCSDIR%%/CH1.xml
+%%DOCSDIR%%/CH2.xml
+%%DOCSDIR%%/CH3.xml
+%%DOCSDIR%%/CH4.xml
+%%DOCSDIR%%/CH5.xml
+%%DOCSDIR%%/CH6.xml
+%%DOCSDIR%%/CH7.xml
+%%DOCSDIR%%/Command.xml
+%%DOCSDIR%%/Dialog.xml
+%%DOCSDIR%%/Form.xml
+%%DOCSDIR%%/Grip.xml
+%%DOCSDIR%%/Label.xml
+%%DOCSDIR%%/List.xml
+%%DOCSDIR%%/MenuButton.xml
+%%DOCSDIR%%/Paned.xml
+%%DOCSDIR%%/Panner.xml
+%%DOCSDIR%%/Porthole.xml
+%%DOCSDIR%%/Repeater.xml
+%%DOCSDIR%%/Scrollbar.xml
+%%DOCSDIR%%/Simple.xml
+%%DOCSDIR%%/SimpleMenu.xml
+%%DOCSDIR%%/Sme.xml
+%%DOCSDIR%%/SmeBSB.xml
+%%DOCSDIR%%/SmeLine.xml
+%%DOCSDIR%%/StripChart.xml
+%%DOCSDIR%%/TPage_Credits.xml
+%%DOCSDIR%%/Template.xml
+%%DOCSDIR%%/Template_private_header_file.xml
+%%DOCSDIR%%/Template_public_header_file.xml
+%%DOCSDIR%%/Template_widget_source_file.xml
+%%DOCSDIR%%/Text.xml
+%%DOCSDIR%%/TextActions.xml
+%%DOCSDIR%%/TextActions_default_translation_bindings.xml
+%%DOCSDIR%%/TextActions_text_widget_actions.xml
+%%DOCSDIR%%/TextCustom.xml
+%%DOCSDIR%%/TextFuncs.xml
+%%DOCSDIR%%/TextSink.xml
+%%DOCSDIR%%/TextSource.xml
+%%DOCSDIR%%/Toggle.xml
+%%DOCSDIR%%/Tree.xml
+%%DOCSDIR%%/Viewport.xml
+%%DOCSDIR%%/libXaw.xml
 @dirrmtry %%DOCSDIR%%
 @dirrmtry include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 720c0d2594a5..7d4ed1ccdaaf 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXmu
-PORTVERSION=	1.0.5
+PORTVERSION=	1.1.0
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 098b6813f66c..45c279a93888 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/libXmu-1.0.5.tar.bz2) = fc4d66be7a1a1eb474954728415e46d6
-SHA256 (xorg/lib/libXmu-1.0.5.tar.bz2) = 0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7
-SIZE (xorg/lib/libXmu-1.0.5.tar.bz2) = 323286
+SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
+SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
diff --git a/x11-toolkits/libXmu/pkg-descr b/x11-toolkits/libXmu/pkg-descr
index cbc65101bb48..7c29c5003c1e 100644
--- a/x11-toolkits/libXmu/pkg-descr
+++ b/x11-toolkits/libXmu/pkg-descr
@@ -1,6 +1,3 @@
 This package contains the X Miscellaneous Utilities libraries.
 
 WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXmu/pkg-plist b/x11-toolkits/libXmu/pkg-plist
index 5b20f35ea4e4..a19fba0b3bc4 100644
--- a/x11-toolkits/libXmu/pkg-plist
+++ b/x11-toolkits/libXmu/pkg-plist
@@ -16,6 +16,7 @@ include/X11/Xmu/Misc.h
 include/X11/Xmu/StdCmap.h
 include/X11/Xmu/StdSel.h
 include/X11/Xmu/SysUtil.h
+include/X11/Xmu/WhitePoint.h
 include/X11/Xmu/WidgetNode.h
 include/X11/Xmu/WinUtil.h
 include/X11/Xmu/Xct.h
@@ -30,4 +31,7 @@ lib/libXmuu.so
 lib/libXmuu.so.1
 libdata/pkgconfig/xmu.pc
 libdata/pkgconfig/xmuu.pc
-@dirrm include/X11/Xmu
+%%DOCSDIR%%/Xmu.xml
+%%DOCSDIR%%/xlogo.svg
+@dirrmtry %%DOCSDIR%%
+@dirrmtry include/X11/Xmu
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index de8746588cb3..e7bc81dea28b 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXt
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.9
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	x11@FreeBSD.org
@@ -15,273 +15,272 @@ COMMENT=	X Toolkit library
 XORG_CAT=	lib
 USE_XORG=	x11 sm xproto:both kbproto
 
-MAN1=		makestrs.1
-MAN3=		XtNew.3 \
-		XtAddGrab.3 \
-		XtAppLock.3 \
-		XtAddActions.3 \
-		XtAddCallback.3 \
-		XtAddEventHandler.3 \
-		XtAddExposureToRegion.3 \
-		XtAddInput.3 \
-		XtAllocateGC.3 \
-		XtAppAddActionHook.3 \
-		XtAppAddActions.3 \
-		XtAppAddBlockHook.3 \
-		XtAppAddConverter.3 \
-		XtAppAddInput.3 \
-		XtAppAddSignal.3 \
-		XtAppAddTimeOut.3 \
-		XtAppAddWorkProc.3 \
-		XtAppCreateShell.3 \
-		XtAppError.3 \
-		XtAppErrorMsg.3 \
-		XtAppGetErrorDatabase.3 \
-		XtAppGetSelectionTimeout.3 \
-		XtAppInitialize.3 \
-		XtAppNextEvent.3 \
-		XtAppReleaseCacheRefs.3 \
-		XtAppSetExitFlag.3 \
-		XtAppSetFallbackResources.3 \
-		XtAppSetTypeConverter.3 \
-		XtBuildEventMask.3 \
-		XtCallAcceptFocus.3 \
-		XtCallActionProc.3 \
-		XtCallCallbacks.3 \
-		XtClass.3 \
-		XtConfigureWidget.3 \
-		XtConvert.3 \
-		XtConvertAndStore.3 \
-		XtCreateApplicationContext.3 \
-		XtCreateApplicationShell.3 \
-		XtCreatePopupShell.3 \
-		XtCreateSelectionRequest.3 \
-		XtCreateWidget.3 \
-		XtCreateWindow.3 \
-		XtDisplay.3 \
-		XtDisplayInitialize.3 \
-		XtDisplayStringConversionWarning.3 \
-		XtDisplayToApplicationContext.3 \
-		XtError.3 \
-		XtErrorMsg.3 \
-		XtFindFile.3 \
-		XtGetActionKeysym.3 \
-		XtGetActionList.3 \
-		XtGetApplicationNameAndClass.3 \
-		XtGetApplicationResources.3 \
-		XtGetClassExtension.3 \
-		XtGetDisplays.3 \
-		XtGetGC.3 \
-		XtGetErrorDatabase.3 \
-		XtGetKeyboardFocusWidget.3 \
-		XtGetKeysymTable.3 \
-		XtGetResourceList.3 \
-		XtGetSelectionParameters.3 \
-		XtGetSelectionRequest.3 \
-		XtGetSelectionTimeout.3 \
-		XtGetSelectionValue.3 \
-		XtGetSelectionValueIncremental.3 \
-		XtGetSubresources.3 \
-		XtGrabKey.3 \
-		XtHooksOfDisplay.3 \
-		XtInitialize.3 \
-		XtInitializeWidgetClass.3 \
-		XtInsertEventTypeHandler.3 \
-		XtLastEventProcessed.3 \
-		XtMakeGeometryRequest.3 \
-		XtMalloc.3 \
-		XtManageChildren.3 \
-		XtMapWidget.3 \
-		XtName.3 \
-		XtNameToWidget.3 \
-		XtNextEvent.3 \
-		XtOffset.3 \
-		XtOpenApplication.3 \
-		XtOwnSelection.3 \
-		XtParent.3 \
-		XtParseAcceleratorTable.3 \
-		XtParseTranslationTable.3 \
-		XtPopdown.3 \
-		XtPopup.3 \
-		XtProcessLock.3 \
-		XtQueryGeometry.3 \
-		XtRealizeWidget.3 \
-		XtRegisterDrawable.3 \
-		XtRegisterGrabAction.3 \
-		XtReservePropertyAtom.3 \
-		XtResolvePathname.3 \
-		XtSessionGetToken.3 \
-		XtSetArg.3 \
-		XtSetKeyTranslator.3 \
-		XtSetKeyboardFocus.3 \
-		XtSetLanguageProc.3 \
-		XtSetMultiClickTime.3 \
-		XtSetSelectionParameters.3 \
-		XtSetSensitive.3 \
-		XtSetValues.3 \
-		XtSetWMColormapWindows.3 \
-		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
+MAN3=	MenuPopdown.3 \
+	MenuPopup.3 \
+	XtAddActions.3 \
+	XtAddCallback.3 \
+	XtAddCallbacks.3 \
+	XtAddConverter.3 \
+	XtAddEventHandler.3 \
+	XtAddExposureToRegion.3 \
+	XtAddGrab.3 \
+	XtAddInput.3 \
+	XtAddRawEventHandler.3 \
+	XtAddTimeOut.3 \
+	XtAddWorkProc.3 \
+	XtAllocateGC.3 \
+	XtAppAddActionHook.3 \
+	XtAppAddActions.3 \
+	XtAppAddBlockHook.3 \
+	XtAppAddConverter.3 \
+	XtAppAddInput.3 \
+	XtAppAddSignal.3 \
+	XtAppAddTimeOut.3 \
+	XtAppAddWorkProc.3 \
+	XtAppCreateShell.3 \
+	XtAppError.3 \
+	XtAppErrorMsg.3 \
+	XtAppGetErrorDatabase.3 \
+	XtAppGetErrorDatabaseText.3 \
+	XtAppGetExitFlag.3 \
+	XtAppGetSelectionTimeout.3 \
+	XtAppInitialize.3 \
+	XtAppLock.3 \
+	XtAppMainLoop.3 \
+	XtAppNextEvent.3 \
+	XtAppPeekEvent.3 \
+	XtAppPending.3 \
+	XtAppProcessEvent.3 \
+	XtAppReleaseCacheRefs.3 \
+	XtAppSetErrorHandler.3 \
+	XtAppSetErrorMsgHandler.3 \
+	XtAppSetExitFlag.3 \
+	XtAppSetFallbackResources.3 \
+	XtAppSetSelectionTimeout.3 \
+	XtAppSetTypeConverter.3 \
+	XtAppSetWarningHandler.3 \
+	XtAppSetWarningMsgHandler.3 \
+	XtAppUnlock.3 \
+	XtAppWarning.3 \
+	XtAppWarningMsg.3 \
+	XtAugmentTranslations.3 \
+	XtBuildEventMask.3 \
+	XtCallAcceptFocus.3\
+	XtCallActionProc.3 \
+	XtCallCallbackList.3 \
+	XtCallCallbacks.3 \
+	XtCallConverter.3 \
+	XtCallbackExclusive.3 \
+	XtCallbackNone.3 \
+	XtCallbackNonexclusive.3 \
+	XtCallbackPopdown.3 \
+	XtCalloc.3 \
+	XtCancelSelectionRequest.3 \
+	XtChangeManagedSet.3 \
+	XtCheckSubclass.3 \
+	XtClass.3\
+	XtCloseDisplay.3\
+	XtConfigureWidget.3\
+	XtConvert.3\
+	XtConvertAndStore.3\
+	XtConvertCase.3\
+	XtCreateApplicationContext.3\
+	XtCreateApplicationShell.3\
+	XtCreateManagedWidget.3\
+	XtCreatePopupShell.3\
+	XtCreateSelectionRequest.3\
+	XtCreateWidget.3\
+	XtCreateWindow.3\
+	XtDatabase.3\
+	XtDestroyApplicationContext.3\
+	XtDestroyWidget.3\
+	XtDirectConvert.3\
+	XtDisownSelection.3 \
+	XtDispatchEvent.3  \
+	XtDispatchEventToWidget.3\
+	XtDisplay.3\
+	XtDisplayInitialize.3\
+	XtDisplayOfObject.3\
+	XtDisplayStringConversionWarning.3\
+	XtDisplayToApplicationContext.3\
+	XtError.3\
+	XtErrorMsg.3\
+	XtFindFile.3\
+	XtFree.3\
+	XtGetActionKeysym.3\
+	XtGetActionList.3\
+	XtGetApplicationNameAndClass.3\
+	XtGetApplicationResources.3\
+	XtGetClassExtension.3\
+	XtGetConstraintResourceList.3\
+	XtGetDisplays.3\
+	XtGetErrorDatabase.3\
+	XtGetErrorDatabaseText.3\
+	XtGetGC.3\
+	XtGetKeyboardFocusWidget.3\
+	XtGetKeysymTable.3\
+	XtGetMultiClickTime.3 \
+	XtGetResourceList.3\
+	XtGetSelectionParameters.3\
+	XtGetSelectionRequest.3\
+	XtGetSelectionTimeout.3\
+	XtGetSelectionValue.3\
+	XtGetSelectionValueIncremental.3 \
+	XtGetSelectionValues.3\
+	XtGetSelectionValuesIncremental.3 \
+	XtGetSubresources.3 \
+	XtGetSubvalues.3 \
+	XtGetValues.3 \
+	XtGrabButton.3 \
+	XtGrabKey.3 \
+	XtGrabKeyboard.3 \
+	XtGrabPointer.3 \
+	XtHasCallbacks.3 \
+	XtHooksOfDisplay.3 \
+	XtInitialize.3 \
+	XtInitializeWidgetClass.3 \
+	XtInsertEventHandler.3 \
+	XtInsertEventTypeHandler.3 \
+	XtInsertRawEventHandler.3 \
+	XtInstallAccelerators.3\
+	XtInstallAllAccelerators.3\
+	XtIsApplicationShell.3\
+	XtIsComposite.3\
+	XtIsConstraint.3\
+	XtIsManaged.3\
+	XtIsObject.3\
+	XtIsOverrideShell.3\
+	XtIsRealized.3\
+	XtIsRectObj.3\
+	XtIsSensitive.3\
+	XtIsSessionShell.3\
+	XtIsShell.3\
+	XtIsSubclass.3\
+	XtIsTopLevelShell.3\
+	XtIsTransientShell.3\
+	XtIsVendorShell.3\
+	XtIsWMShell.3\
+	XtIsWidget.3\
+	XtKeysymToKeycodeList.3\
+	XtLastEventProcessed.3\
+	XtLastTimestampProcessed.3 \
+	XtMainLoop.3 \
+	XtMakeGeometryRequest.3 \
+	XtMakeResizeRequest.3 \
+	XtMalloc.3 \
+	XtManageChild.3 \
+	XtManageChildren.3 \
+	XtMapWidget.3 \
+	XtMergeArgLists.3 \
+	XtMoveWidget.3 \
+	XtName.3 \
+	XtNameToWidget.3 \
+	XtNew.3 \
+	XtNewString.3 \
+	XtNextEvent.3 \
+	XtNoticeSignal.3 \
+	XtNumber.3 \
+	XtOffset.3 \
+	XtOffsetOf.3 \
+	XtOpenApplication.3 \
+	XtOpenDisplay.3 \
+	XtOverrideTranslations.3 \
+	XtOwnSelection.3 \
+	XtOwnSelectionIncremental.3 \
+	XtParent.3 \
+	XtParseAcceleratorTable.3 \
+	XtParseTranslationTable.3 \
+	XtPeekEvent.3 \
+	XtPending.3 \
+	XtPopdown.3 \
+	XtPopup.3 \
+	XtPopupSpringLoaded.3 \
+	XtProcessEvent.3 \
+	XtProcessLock.3 \
+	XtProcessUnlock.3 \
+	XtQueryGeometry.3 \
+	XtRealizeWidget.3 \
+	XtRealloc.3 \
+	XtRegisterCaseConverter.3 \
+	XtRegisterDrawable.3 \
+	XtRegisterExtensionSelector.3 \
+	XtRegisterGrabAction.3 \
+	XtReleaseGC.3 \
+	XtReleasePropertyAtom.3 \
+	XtRemoveActionHook.3 \
+	XtRemoveAllCallbacks.3 \
+	XtRemoveBlockHook.3 \
+	XtRemoveCallback.3 \
+	XtRemoveCallbacks.3 \
+	XtRemoveEventHandler.3\
+	XtRemoveEventTypeHandler.3\
+	XtRemoveGrab.3\
+	XtRemoveInput.3\
+	XtRemoveRawEventHandler.3\
+	XtRemoveSignal.3\
+	XtRemoveTimeOut.3\
+	XtRemoveWorkProc.3\
+	XtReservePropertyAtom.3\
+	XtResizeWidget.3\
+	XtResolvePathname.3\
+	XtScreen.3\
+	XtScreenDatabase.3\
+	XtScreenOfObject.3\
+	XtSendSelectionRequest.3\
+	XtSessionGetToken.3\
+	XtSessionReturnToken.3\
+	XtSetArg.3\
+	XtSetErrorHandler.3\
+	XtSetErrorMsgHandler.3\
+	XtSetEventDispatcher.3\
+	XtSetKeyTranslator.3\
+	XtSetKeyboardFocus.3\
+	XtSetLanguageProc.3 \
+	XtSetMappedWhenManaged.3 \
+	XtSetMultiClickTime.3 \
+	XtSetSelectionParameters.3 \
+	XtSetSelectionTimeout.3 \
+	XtSetSensitive.3 \
+	XtSetSubvalues.3 \
+	XtSetTypeConverter.3 \
+	XtSetValues.3 \
+	XtSetWMColormapWindows.3 \
+	XtSetWarningHandler.3 \
+	XtSetWarningMsgHandler.3\
+	XtStringConversionWarning.3\
+	XtSuperclass.3\
+	XtToolkitInitialize.3\
+	XtToolkitThreadInitialize.3\
+	XtTranslateCoords.3 \
+	XtTranslateKeycode.3\
+	XtUngrabButton.3\
+	XtUngrabKey.3\
+	XtUngrabKeyboard.3\
+	XtUngrabPointer.3\
+	XtUninstallTranslations.3\
+	XtUnmanageChild.3\
+	XtUnmanageChildren.3\
+	XtUnmapWidget.3\
+	XtUnrealizeWidget.3\
+	XtUnregisterDrawable.3\
+	XtVaAppCreateShell.3\
+	XtVaAppInitialize.3\
+	XtVaCreateArgsList.3\
+	XtVaCreateManagedWidget.3\
+	XtVaCreatePopupShell.3\
+	XtVaCreateWidget.3\
+	XtVaGetApplicationResources.3\
+	XtVaGetSubresources.3\
+	XtVaGetSubvalues.3 \
+	XtVaGetValues.3 \
+	XtVaOpenApplication.3\
+	XtVaSetSubvalues.3\
+	XtVaSetValues.3\
+	XtWarning.3 \
+	XtWarningMsg.3\
+	XtWidgetToApplicationContext.3\
+	XtWindow.3 \
+	XtWindowOfObject.3 \
+	XtWindowToWidget.3
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index fe2a7b4fa91e..67f296198a07 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/libXt-1.0.7.tar.bz2) = 96f3c93434a93186d178b60d4a262496
-SHA256 (xorg/lib/libXt-1.0.7.tar.bz2) = 706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
-SIZE (xorg/lib/libXt-1.0.7.tar.bz2) = 559875
+SHA256 (xorg/lib/libXt-1.0.9.tar.bz2) = eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01
+SIZE (xorg/lib/libXt-1.0.9.tar.bz2) = 685981
diff --git a/x11-toolkits/libXt/pkg-descr b/x11-toolkits/libXt/pkg-descr
index 36f0e095cbad..0369c4fec061 100644
--- a/x11-toolkits/libXt/pkg-descr
+++ b/x11-toolkits/libXt/pkg-descr
@@ -1,6 +1,3 @@
 This package contains the X Toolkit library.
 
 WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 0f587df53eee..2020099d260d 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -1,39 +1,38 @@
-bin/makestrs
-include/X11/StringDefs.h
-include/X11/Shell.h
+include/X11/CallbackI.h
 include/X11/Composite.h
 include/X11/CompositeP.h
 include/X11/ConstrainP.h
 include/X11/Constraint.h
+include/X11/ConvertI.h
 include/X11/Core.h
 include/X11/CoreP.h
-include/X11/Intrinsic.h
-include/X11/Object.h
-include/X11/IntrinsicP.h
-include/X11/ObjectP.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/ResConfigP.h
-include/X11/ShellP.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/CallbackI.h
-include/X11/ConvertI.h
 include/X11/CreateI.h
 include/X11/EventI.h
 include/X11/HookObjI.h
 include/X11/InitialI.h
+include/X11/Intrinsic.h
 include/X11/IntrinsicI.h
+include/X11/IntrinsicP.h
+include/X11/Object.h
+include/X11/ObjectP.h
 include/X11/PassivGraI.h
+include/X11/RectObj.h
+include/X11/RectObjP.h
+include/X11/ResConfigP.h
 include/X11/ResourceI.h
 include/X11/SelectionI.h
+include/X11/Shell.h
 include/X11/ShellI.h
+include/X11/ShellP.h
+include/X11/StringDefs.h
 include/X11/ThreadsI.h
 include/X11/TranslateI.h
 include/X11/VarargsI.h
+include/X11/Vendor.h
+include/X11/VendorP.h
 include/X11/Xtos.h
-lib/libXt.so.6
-lib/libXt.so
-lib/libXt.la
 lib/libXt.a
+lib/libXt.la
+lib/libXt.so
+lib/libXt.so.6
 libdata/pkgconfig/xt.pc