5 files changed, 204 insertions, 93 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index da25b70d488c..0681b7f87eb4 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libX11
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.1.2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 6b9af7b0f53e..76b0a1d09677 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libX11-1.1.1.tar.bz2) = 848b80f77b20ae1fa5c882bbfa531ebc
-SHA256 (xorg/lib/libX11-1.1.1.tar.bz2) = 5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541
-SIZE (xorg/lib/libX11-1.1.1.tar.bz2) = 1426405
+MD5 (xorg/lib/libX11-1.1.2.tar.bz2) = 710bf38a9477a5a1b235bc94f1d0593c
+SHA256 (xorg/lib/libX11-1.1.2.tar.bz2) = b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e
+SIZE (xorg/lib/libX11-1.1.2.tar.bz2) = 1523644
diff --git a/x11/libX11/files/patch-src_ImUtil.c b/x11/libX11/files/patch-src_ImUtil.c
deleted file mode 100644
index 2579201bad8b..000000000000
--- a/x11/libX11/files/patch-src_ImUtil.c
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git src/ImUtil.c src/ImUtil.c
-index 83fd030..9e667bb 100644
---- src/ImUtil.c
-+++ src/ImUtil.c
-@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
- {
- 	register XImage *image;
- 	int bits_per_pixel = 1;
-+	int min_bytes_per_line;
- 
- 	if (depth == 0 || depth > 32 ||
- 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
- 	    (format == XYBitmap && depth != 1) ||
- 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
--	    offset < 0 || image_bytes_per_line < 0)
-+	    offset < 0)
- 	    return (XImage *) NULL;
- 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
- 	    return (XImage *) NULL;
-@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image_bytes_per_line == 0)
- 	{
- 	if (format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((width + offset), image->bitmap_pad);
- 	}
--	else image->bytes_per_line = image_bytes_per_line;
-+	if (image_bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image_bytes_per_line < min_bytes_per_line) {
-+	    return 0;
-+	} else {
-+	    image->bytes_per_line = image_bytes_per_line;
-+	}
- 
- 	image->bits_per_pixel = bits_per_pixel;
- 	image->obdata = NULL;
-@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
- Status XInitImage (image)
-     XImage *image;
- {
-+	int min_bytes_per_line;
-+
- 	if (image->depth == 0 || image->depth > 32 ||
-+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
-+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
- 	    (image->format != XYBitmap &&
- 	     image->format != XYPixmap &&
- 	     image->format != ZPixmap) ||
-@@ -392,21 +402,24 @@ Status XInitImage (image)
- 	    (image->bitmap_pad != 8 &&
- 	     image->bitmap_pad != 16 &&
- 	     image->bitmap_pad != 32) ||
--	    image->xoffset < 0 || image->bytes_per_line < 0)
-+	    image->xoffset < 0)
- 	    return 0;
- 
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image->bytes_per_line == 0)
--	{
- 	if (image->format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((image->bits_per_pixel * image->width),
- 		       image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
-+
-+	if (image->bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image->bytes_per_line < min_bytes_per_line) {
-+	    return 0;
- 	}
- 
- 	_XInitImageFuncPtrs (image);
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index d018aca79868..fce86a29b4d6 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -548,6 +548,206 @@ XcmsTekHVCQueryMaxV.3 \
 XcmsTekHVCQueryMaxVC.3 \
 XcmsTekHVCQueryMaxVSamples.3 \
 XcmsTekHVCQueryMinV.3 \
+XkbActionCtrls.3 \
+XkbAddDeviceLedInfo.3 \
+XkbAddGeomColor.3 \
+XkbAddGeomDoodad.3 \
+XkbAddGeomKeyAlias.3 \
+XkbAddGeomKey.3 \
+XkbAddGeomOutline.3 \
+XkbAddGeomOverlayKey.3 \
+XkbAddGeomOverlayRow.3 \
+XkbAddGeomOverlay.3 \
+XkbAddGeomProperty.3 \
+XkbAddGeomRow.3 \
+XkbAddGeomSection.3 \
+XkbAddGeomShape.3 \
+XkbAddSymInterpret.3 \
+XkbAllocClientMap.3 \
+XkbAllocCompatMap.3 \
+XkbAllocControls.3 \
+XkbAllocDeviceInfo.3 \
+XkbAllocDeviceLedInfo.3 \
+XkbAllocGeomColors.3 \
+XkbAllocGeomDoodads.3 \
+XkbAllocGeometry.3 \
+XkbAllocGeomKeyAliases.3 \
+XkbAllocGeomKeys.3 \
+XkbAllocGeomOutlines.3 \
+XkbAllocGeomOverlayKey.3 \
+XkbAllocGeomOverlayRows.3 \
+XkbAllocGeomOverlays.3 \
+XkbAllocGeomPoints.3 \
+XkbAllocGeomProps.3 \
+XkbAllocGeomRows.3 \
+XkbAllocGeomSectionDoodads.3 \
+XkbAllocGeomSections.3 \
+XkbAllocGeomShapes.3 \
+XkbAllocIndicatorMaps.3 \
+XkbAllocKeyboard.3 \
+XkbAllocNames.3 \
+XkbAllocServerMap.3 \
+XkbApplyCompatMapToKey.3 \
+XkbBellEvent.3 \
+XkbBell.3 \
+XkbComputeRowBounds.3 \
+XkbComputeSectionBounds.3 \
+XkbComputeShapeBounds.3 \
+XkbComputeShapeTop.3 \
+XkbCopyKeyTypes.3 \
+XkbCopyKeyType.3 \
+XkbDeviceBellEvent.3 \
+XkbDeviceBell.3 \
+XkbFindOverlayForKey.3 \
+XkbForceBell.3 \
+XkbForceDeviceBell.3 \
+XkbFreeClientMap.3 \
+XkbFreeCompatMap.3 \
+XkbFreeComponentList.3 \
+XkbFreeControls.3 \
+XkbFreeDeviceInfo.3 \
+XkbFreeGeomColors.3 \
+XkbFreeGeomDoodads.3 \
+XkbFreeGeometry.3 \
+XkbFreeGeomKeyAliases.3 \
+XkbFreeGeomKeys.3 \
+XkbFreeGeomOutlines.3 \
+XkbFreeGeomOverlayKeys.3 \
+XkbFreeGeomOverlayRows.3 \
+XkbFreeGeomOverlays.3 \
+XkbFreeGeomPoints.3 \
+XkbFreeGeomProperties.3 \
+XkbFreeGeomRows.3 \
+XkbFreeGeomSections.3 \
+XkbFreeGeomShapes.3 \
+XkbFreeIndicatorMaps.3 \
+XkbFreeKeyboard.3 \
+XkbFreeNames.3 \
+XkbFreeServerMap.3 \
+XkbGetAccessXTimeout.3 \
+XkbGetAutoRepeatRate.3 \
+XkbGetAutoResetControls.3 \
+XkbGetBounceKeysDelay.3 \
+XkbGetCompatMap.3 \
+XkbGetControlsChanges.3 \
+XkbGetControls.3 \
+XkbGetDetectableAutorepeat.3 \
+XkbGetDeviceButtonActions.3 \
+XkbGetDeviceInfoChanges.3 \
+XkbGetDeviceInfo.3 \
+XkbGetDeviceLedInfo.3 \
+XkbGetGeometry.3 \
+XkbGetIndicatorChanges.3 \
+XkbGetIndicatorMap.3 \
+XkbGetIndicatorState.3 \
+XkbGetKeyActions.3 \
+XkbGetKeyBehaviors.3 \
+XkbGetKeyboardByName.3 \
+XkbGetKeyboard.3 \
+XkbGetKeyExplicitComponents.3 \
+XkbGetKeyModifierMap.3 \
+XkbGetKeySyms.3 \
+XkbGetKeyTypes.3 \
+XkbGetKeyVirtualModMap.3 \
+XkbGetMap.3 \
+XkbGetNamedGeometry.3 \
+XkbGetNamedIndicator.3 \
+XkbGetNameChanges.3 \
+XkbGetNames.3 \
+XkbGetSlowKeysDelay.3 \
+XkbGetState.3 \
+XkbGetStickyKeysOptions.3 \
+XkbGetUpdatedMap.3 \
+XkbGetVirtualMods.3 \
+XkbGetXlibControls.3 \
+XkbChangeControls.3 \
+XkbChangeDeviceInfo.3 \
+XkbChangeEnabledControls.3 \
+XkbChangeIndicators.3 \
+XkbChangeMap.3 \
+XkbChangeNames.3 \
+XkbChangeTypesOfKey.3 \
+XkbIgnoreExtension.3 \
+XkbInitCanonicalKeyTypes.3 \
+XkbKeyActionEntry.3 \
+XkbKeyActionsPtr.3 \
+XkbKeyAction.3 \
+XkbKeycodeToKeysym.3 \
+XkbKeyGroupInfo.3 \
+XkbKeyGroupsWidth.3 \
+XkbKeyGroupWidth.3 \
+XkbKeyHasActions.3 \
+XkbKeyNumActions.3 \
+XkbKeyNumGroups.3 \
+XkbKeyNumSyms.3 \
+XkbKeySymEntry.3 \
+XkbKeySymsOffset.3 \
+XkbKeySymsPtr.3 \
+XkbKeysymToModifiers.3 \
+XkbKeyTypeIndex.3 \
+XkbKeyTypesForCoreSymbols.3 \
+XkbKeyType.3 \
+XkbLatchGroup.3 \
+XkbLatchModifiers.3 \
+XkbLibraryVersion.3 \
+XkbListComponents.3 \
+XkbLockGroup.3 \
+XkbLockModifiers.3 \
+XkbLookupKeyBinding.3 \
+XkbLookupKeySym.3 \
+XkbModActionVMods.3 \
+XkbNoteControlsChanges.3 \
+XkbNoteDeviceChanges.3 \
+XkbNoteIndicatorChanges.3 \
+XkbNoteNameChanges.3 \
+XkbOpenDisplay.3 \
+XkbOutOfRangeGroupInfo.3 \
+XkbOutOfRangeGroupNumber.3 \
+XkbPtrActionX.3 \
+XkbPtrActionY.3 \
+XkbQueryExtension.3 \
+XkbRefreshKeyboardMapping.3 \
+XkbResizeDeviceButtonActions.3 \
+XkbResizeKeyActions.3 \
+XkbResizeKeySyms.3 \
+XkbResizeKeyType.3 \
+XkbSAActionSetCtrls.3 \
+XkbSAGroup.3 \
+XkbSAPtrDfltValue.3 \
+XkbSARedirectSetVModsMask.3 \
+XkbSARedirectSetVMods.3 \
+XkbSARedirectVModsMask.3 \
+XkbSARedirectVMods.3 \
+XkbSAScreen.3 \
+XkbSASetGroup.3 \
+XkbSASetPtrDfltValue.3 \
+XkbSASetScreen.3 \
+XkbSelectEventDetails.3 \
+XkbSelectEvents.3 \
+XkbSetAccessXTimeout.3 \
+XkbSetAutoRepeatRate.3 \
+XkbSetAutoResetControls.3 \
+XkbSetBounceKeysDelay.3 \
+XkbSetCompatMap.3 \
+XkbSetControls.3 \
+XkbSetDebuggingFlags.3 \
+XkbSetDetectableAutorepeat.3 \
+XkbSetDeviceButtonActions.3 \
+XkbSetDeviceInfo.3 \
+XkbSetIgnoreLockMods.3 \
+XkbSetIndicatorMap.3 \
+XkbSetMap.3 \
+XkbSetModActionVMods.3 \
+XkbSetNamedIndicator.3 \
+XkbSetNames.3 \
+XkbSetPtrActionX.3 \
+XkbSetPtrActionY.3 \
+XkbSetServerInternalMods.3 \
+XkbSetXlibControls.3 \
+XkbTranslateKeyCode.3 \
+XkbTranslateKeySym.3 \
+XkbUpdateMapFromCore.3 \
+XkbVirtualModsToReal.3 \
 XmbDrawImageString.3 \
 XmbDrawString.3 \
 XmbDrawText.3 \
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index f530572bd111..8244c232c2a6 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -255,4 +255,3 @@ lib/X11/locale/compose.dir
 @dirrm lib/X11/locale/C
 @dirrm lib/X11/locale/armscii-8
 @dirrm lib/X11/locale
-@dirrm lib/X11