Update 2.3.5 --> 2.3.6

3 files changed, 9 insertions, 35 deletions

diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index a86090699e94..06d7bcd24d35 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	open-motif
-PORTVERSION=	2.3.5
+PORTVERSION=	2.3.6
 CATEGORIES=	x11-toolkits
 # MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
-MASTER_SITES=	SF/motif/Motif%202.3.5%20Source%20Code/
+MASTER_SITES=	SF/motif/Motif%202.3.6%20Source%20Code/
 DISTNAME=	motif-${PORTVERSION}
 
 MAINTAINER=	cy@FreeBSD.org
@@ -19,7 +19,10 @@ MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif-[0-9]*
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig
-USE_XORG=	x11 xaw xbitmaps xext xft xt
+USE_XORG=	x11 xaw xbitmaps xext xft xt xmu xrender sm ice
+LIB_DEPENDS=	libXp.so:x11/libXp \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
diff --git a/x11-toolkits/open-motif/distinfo b/x11-toolkits/open-motif/distinfo
index b87d6069e9c0..bdf209d9c32a 100644
--- a/x11-toolkits/open-motif/distinfo
+++ b/x11-toolkits/open-motif/distinfo
@@ -1,2 +1,3 @@
-SHA256 (motif-2.3.5.tar.gz) = afc5c93c03327a7207f5822c272aaf0d98439007aa85a23149f833ba24916d25
-SIZE (motif-2.3.5.tar.gz) = 6035803
+TIMESTAMP = 1465621623
+SHA256 (motif-2.3.6.tar.gz) = fa810e6bedeca0f5a2eb8216f42129bcf6bd23919068d433e386b7bfc05d58cf
+SIZE (motif-2.3.6.tar.gz) = 5725456
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index 0472021f0f3e..687d96092226 100644
--- a/x11-toolkits/open-motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist
@@ -992,21 +992,17 @@ man/man5/UIL.5.gz
 man/man5/WML.5.gz
 man/manm/exm_in_c.man.gz
 man/manm/simpleDemo.man.gz
-share/Xm/ButtonBox/Imakefile
 share/Xm/ButtonBox/bboxdemo
 share/Xm/ButtonBox/bboxdemo.c
-share/Xm/Color/Imakefile
 share/Xm/Color/colordemo
 share/Xm/Color/colordemo.c
 share/Xm/Color/util-c.c
 share/Xm/Column/Column.ad
-share/Xm/Column/Imakefile
 share/Xm/Column/column
 share/Xm/Column/column.c
 share/Xm/Exm/app_in_c/exm_in_c
 share/Xm/Exm/simple_app/README
 share/Xm/Exm/simple_app/simpleDemo
-share/Xm/Ext18list/Imakefile
 share/Xm/Ext18list/callbacks-c.c
 share/Xm/Ext18list/creation.c
 share/Xm/Ext18list/ext18list
@@ -1018,30 +1014,24 @@ share/Xm/Ext18list/pixmaps/eye.xpm
 share/Xm/Ext18list/pixmaps/porsche.xpm
 share/Xm/Ext18list/pixmaps/stopsign.xpm
 share/Xm/Ext18list/util-c.c
-share/Xm/Icon/Imakefile
 share/Xm/Icon/iconbuttondemo
 share/Xm/Icon/iconbuttondemo.c
 share/Xm/Icon/misc.c
 share/Xm/Icon/small.bm
-share/Xm/Outline/Imakefile
 share/Xm/Outline/outline
 share/Xm/Outline/outline.c
-share/Xm/Paned2/Imakefile
 share/Xm/Paned2/creation-c.c
 share/Xm/Paned2/paned
 share/Xm/Paned2/paned.c
-share/Xm/Tabstack/Imakefile
 share/Xm/Tabstack/bxutils.c
 share/Xm/Tabstack/callbacks.c
 share/Xm/Tabstack/creation.c
 share/Xm/Tabstack/creation.h
 share/Xm/Tabstack/main.c
 share/Xm/Tabstack/tabstack
-share/Xm/Tree/Imakefile
 share/Xm/Tree/bxutil-c.c
 share/Xm/Tree/tree
 share/Xm/Tree/tree.c
-share/Xm/airport/Imakefile
 share/Xm/airport/README
 share/Xm/airport/XmdAirport.ad
 share/Xm/airport/airport
@@ -1052,7 +1042,6 @@ share/Xm/airport/dropsite.c
 share/Xm/airport/dropsite.h
 share/Xm/airport/main.c
 share/Xm/airport/main.h
-share/Xm/animate/Imakefile
 share/Xm/animate/README
 share/Xm/animate/XmdAnimate.ad
 share/Xm/animate/animate.help
@@ -1074,38 +1063,32 @@ share/Xm/animate/xmanimate.c
 share/Xm/animate/xmanimate.man
 share/Xm/animate/xmanimate.uid
 share/Xm/animate/xmanimate.uil
-share/Xm/autopopups/Imakefile
 share/Xm/autopopups/README
 share/Xm/autopopups/autopopups
 share/Xm/autopopups/autopopups.c
 share/Xm/autopopups/autopopups.man
 share/Xm/combo2/Combo.ad
-share/Xm/combo2/Imakefile
 share/Xm/combo2/combo
 share/Xm/combo2/combo.c
 share/Xm/drag_and_drop/DNDDemo
 share/Xm/drag_and_drop/DNDDemo.c
 share/Xm/drag_and_drop/DNDDemo.man
 share/Xm/drag_and_drop/DNDDraw.c
-share/Xm/drag_and_drop/Imakefile
 share/Xm/drag_and_drop/README
 share/Xm/drag_and_drop/simpledrop
 share/Xm/drag_and_drop/simpledrop.c
 share/Xm/drag_and_drop/simpledrop.man
-share/Xm/draw/Imakefile
 share/Xm/draw/README
 share/Xm/draw/XmdDraw.ad
 share/Xm/draw/draw
 share/Xm/draw/draw.c
 share/Xm/draw/draw.help
 share/Xm/draw/draw.man
-share/Xm/earth/Imakefile
 share/Xm/earth/README
 share/Xm/earth/earth
 share/Xm/earth/earth.c
 share/Xm/earth/earth.man
 share/Xm/earth/terre.xbm
-share/Xm/filemanager/Imakefile
 share/Xm/filemanager/XmdFilemanager.ad
 share/Xm/filemanager/actions.c
 share/Xm/filemanager/code.xpm
@@ -1150,32 +1133,27 @@ share/Xm/fileview/mainE.h
 share/Xm/fileview/text.c
 share/Xm/fileview/text.h
 share/Xm/fileview/textE.h
-share/Xm/fontsel/Imakefile
 share/Xm/fontsel/callbacks-c.c
 share/Xm/fontsel/creation-c.c
 share/Xm/fontsel/fontsel
 share/Xm/fontsel/fontsel.c
 share/Xm/fontsel/fontsel.h
-share/Xm/getsubres/Imakefile
 share/Xm/getsubres/README
 share/Xm/getsubres/getsubres
 share/Xm/getsubres/getsubres.c
 share/Xm/getsubres/getsubres.help
 share/Xm/getsubres/getsubres.man
-share/Xm/helloint/Imakefile
 share/Xm/helloint/README
 share/Xm/helloint/helloint
 share/Xm/helloint/helloint.c
 share/Xm/helloint/helloint.man
 share/Xm/helloint/helloint.uid
 share/Xm/helloint/helloint.uil
-share/Xm/hellomotif/Imakefile
 share/Xm/hellomotif/README
 share/Xm/hellomotif/hellomotif
 share/Xm/hellomotif/hellomotif.c
 share/Xm/hellomotif/hellomotif.uid
 share/Xm/hellomotif/hellomotif.uil
-share/Xm/i18ninput/Imakefile
 share/Xm/i18ninput/README
 share/Xm/i18ninput/XmdI18nInput.ad
 share/Xm/i18ninput/i18ninput
@@ -1183,12 +1161,10 @@ share/Xm/i18ninput/i18ninput.c
 share/Xm/i18ninput/i18ninput.help
 share/Xm/i18ninput/i18ninput.man
 share/Xm/i18ninput/input.c
-share/Xm/panner/Imakefile
 share/Xm/panner/README
 share/Xm/panner/panner
 share/Xm/panner/panner.c
 share/Xm/panner/panner.man
-share/Xm/periodic/Imakefile
 share/Xm/periodic/README
 share/Xm/periodic/XmdPeriodic.ad
 share/Xm/periodic/periodic
@@ -1196,7 +1172,6 @@ share/Xm/periodic/periodic.c
 share/Xm/periodic/periodic.uid
 share/Xm/periodic/periodic.uil
 share/Xm/periodic/periodic_l.uil
-share/Xm/piano/Imakefile
 share/Xm/piano/Inv8_part1.piano
 share/Xm/piano/Inv8_part2.piano
 share/Xm/piano/README
@@ -1209,7 +1184,6 @@ share/Xm/pixmaps/crab.xpm
 share/Xm/pixmaps/eye.xpm
 share/Xm/pixmaps/porsche.xpm
 share/Xm/pixmaps/stopsign.xpm
-share/Xm/sampler2_0/Imakefile
 share/Xm/sampler2_0/README
 share/Xm/sampler2_0/XmdSampler2_0.ad
 share/Xm/sampler2_0/bee.xpm
@@ -1229,13 +1203,11 @@ share/Xm/sampler2_0/sampler2_0.man
 share/Xm/sampler2_0/spir.xpm
 share/Xm/sampler2_0/stack.xpm
 share/Xm/sampler2_0/text.xpm
-share/Xm/setDate/Imakefile
 share/Xm/setDate/README
 share/Xm/setDate/XmdSetDate.ad
 share/Xm/setDate/setDate
 share/Xm/setDate/setDate.c
 share/Xm/setDate/setDate.man
-share/Xm/todo/Imakefile
 share/Xm/todo/README
 share/Xm/todo/XmdTodo.ad
 share/Xm/todo/actions.c
@@ -1246,10 +1218,8 @@ share/Xm/todo/todo
 share/Xm/todo/todo.c
 share/Xm/todo/todo.help
 share/Xm/todo/todo.man
-share/Xm/tooltips/Imakefile
 share/Xm/tooltips/tooltips
 share/Xm/tooltips/tooltips.c
-share/Xm/wsm/Imakefile
 share/Xm/wsm/README
 share/Xm/wsm/client_win.c
 share/Xm/wsm/command_ui.c