[Midnightbsd-cvs] mports [23752] trunk/x11-toolkits/open-motif/pkg-plist: update open motif to 2.3.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 18 17:31:30 EDT 2018


Revision: 23752
          http://svnweb.midnightbsd.org/mports/?rev=23752
Author:   laffer1
Date:     2018-08-18 17:31:29 -0400 (Sat, 18 Aug 2018)
Log Message:
-----------
update open motif to 2.3.8

Modified Paths:
--------------
    trunk/x11-toolkits/open-motif/Makefile
    trunk/x11-toolkits/open-motif/distinfo
    trunk/x11-toolkits/open-motif/pkg-descr
    trunk/x11-toolkits/open-motif/pkg-plist

Added Paths:
-----------
    trunk/x11-toolkits/open-motif/files/patch-configure.ac

Property Changed:
----------------
    trunk/x11-toolkits/open-motif/pkg-descr

Modified: trunk/x11-toolkits/open-motif/Makefile
===================================================================
--- trunk/x11-toolkits/open-motif/Makefile	2018-08-18 21:28:43 UTC (rev 23751)
+++ trunk/x11-toolkits/open-motif/Makefile	2018-08-18 21:31:29 UTC (rev 23752)
@@ -1,12 +1,11 @@
 # $MidnightBSD$
 
 PORTNAME=	open-motif
-PORTVERSION=	2.3.4
-PORTREVISION=	3
+PORTVERSION=	2.3.8
 CATEGORIES=	x11-toolkits
 # MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
-MASTER_SITES=	SF/motif/Motif%202.3.4%20Source%20Code/
-DISTNAME=	motif-${PORTVERSION}-src
+MASTER_SITES=	SF/motif/Motif%20${PORTVERSION}%20Source%20Code/
+DISTNAME=	motif-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
@@ -14,68 +13,24 @@
 LICENSE=	lgpl2.1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif-[0-9]*
-WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
-USES=		gmake iconv libtool:keepla pkgconfig tar:tgz
-USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
-ACLOCAL_ARGS=	-I.
-AUTOMAKE_ARGS=	-a -c -f --foreign
-USE_XORG=	x11 xaw xbitmaps xext xft xt
+USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig
+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 \
+		libpng.so:graphics/png
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_ENV=	LANG=C
 CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 
-DEMOS_SRC=	${WRKSRC}/demos/programs
+OPTIONS_DEFINE=	DOCS
 
-.ifdef USE_MOTIF
-.error You have `USE_MOTIF' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.if defined(WITH_JDK_PATCH)
-
-PKGNAMESUFFIX=	-jdk
-WITHOUT_OPENMOTIF_MANUALS=	YES
-
-.if exists(${WITH_JDK_PATCH})
-EXTRA_PATCHES+=	${WITH_JDK_PATCH}
-.else
-.error "wrong WITH_JDK_PATCH value"
-.endif
-
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=	--with-pic
-.endif
-
-# User config option: Build and install Motif demos
-.if defined(WITH_OPENMOTIF_DEMOS)
-MAKE_ENV+=	DEMOS="demos"
-PLIST_SUB+=	MOTIF_DEMOS=""
-.else
-PLIST_SUB+=	MOTIF_DEMOS="@comment "
-.endif
-
-# User config option: Build and install Motif manuals
-.if !defined(WITHOUT_OPENMOTIF_MANUALS)
-PLIST_SUB+=	MANUALS=""
-.else
-PLIST_SUB+=	MANUALS="@comment "
-.endif
-
 post-patch:
-	@${FIND} ${DEMOS_SRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^install-data-am: |install-data-am: # |g'
 # fix sections
 	@${FIND} ${WRKSRC}/doc/man/man1 -name '*.1' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|user cmd|1|'
@@ -88,93 +43,10 @@
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
-
 post-install:
-.if defined(WITH_OPENMOTIF_DEMOS)
-	${INSTALL_DATA} ${DEMOS_SRC}/Column/Column.ad \
-		${PREFIX}/lib/X11/app-defaults/Column
-	${INSTALL_DATA} ${DEMOS_SRC}/DropDown/DropDown.ad \
-		${PREFIX}/lib/X11/app-defaults/DropDown
-	${INSTALL_DATA} ${DEMOS_SRC}/airport/XmdAirport.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdAirport
-	${INSTALL_DATA} ${DEMOS_SRC}/animate/XmdAnimate.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdAnimate
-	${INSTALL_DATA} ${DEMOS_SRC}/draw/XmdDraw.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdDraw
-	${INSTALL_DATA} ${DEMOS_SRC}/filemanager/XmdFilemanager.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdFilemanager
-	${INSTALL_DATA} ${DEMOS_SRC}/fileview/Fileview.ad \
-		${PREFIX}/lib/X11/app-defaults/Fileview
-	${INSTALL_DATA} ${DEMOS_SRC}/i18ninput/XmdI18nInput.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdI18nInput
-	${INSTALL_DATA} ${DEMOS_SRC}/periodic/XmdPeriodic.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdPeriodic
-	${INSTALL_DATA} ${DEMOS_SRC}/sampler2_0/XmdSampler2_0.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdSampler2_0
-	${INSTALL_DATA} ${DEMOS_SRC}/setdate/XmdSetDate.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdSetDate
-	${INSTALL_DATA} ${DEMOS_SRC}/todo/XmdTodo.ad \
-		${PREFIX}/lib/X11/app-defaults/XmdTodo
-	@${MKDIR} ${PREFIX}/lib/X11/help
-.for i in animate draw filemanager getsubres i18ninput sampler2_0 todo
-	${INSTALL_DATA} ${DEMOS_SRC}/${i}/${i}.help \
-		${PREFIX}/lib/X11/help/${i}.help
-.endfor
-	@${MKDIR} ${PREFIX}/lib/X11/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/animate/dog.uid \
-		${PREFIX}/lib/X11/uid/dog.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/animate/plane.uid \
-		${PREFIX}/lib/X11/uid/plane.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/animate/superman.uid \
-		${PREFIX}/lib/X11/uid/superman.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/animate/xmanimate.uid \
-		${PREFIX}/lib/X11/uid/xmanimate.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/fileview/English.uid \
-		${PREFIX}/lib/X11/uid/English.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/fileview/French.uid \
-		${PREFIX}/lib/X11/uid/French.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/fileview/German.uid \
-		${PREFIX}/lib/X11/uid/German.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotif/hellomotif.uid \
-		${PREFIX}/lib/X11/uid/hellomotif.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/periodic/periodic.uid \
-		${PREFIX}/lib/X11/uid/periodic.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/C/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/C/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/C/uid/l_strings.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/english/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/english/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/english/uid/l_strings.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/french/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/french/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/french/uid/l_strings.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/hebrew/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/hebrew/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/hebrew/uid/l_strings.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/japanese/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/japanese/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/japanese/uid/l_strings.uid
-	@${MKDIR} ${PREFIX}/lib/X11/uid/swedish/uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/swedish/uid/l_strings.uid \
-		${PREFIX}/lib/X11/uid/swedish/uid/l_strings.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/helloint.uid \
-		${PREFIX}/lib/X11/uid
-.for i in earth filemanager getsubres i18ninput panner piano sampler2_0 todo
-	${INSTALL_MAN} ${DEMOS_SRC}/${i}/${i}.man \
-		${MANPREFIX}/man/man1/${i}.1
-.endfor
-	${INSTALL_MAN} ${DEMOS_SRC}/popups/autopopups.man \
-		${MANPREFIX}/man/man1/autopopups.1
-	${INSTALL_MAN} ${DEMOS_SRC}/setdate/setDate.man \
-		${MANPREFIX}/man/man1/setDate.1
-.endif
-.if !defined(WITHOUT_OPENMOTIF_MANUALS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11-toolkits/open-motif/distinfo
===================================================================
--- trunk/x11-toolkits/open-motif/distinfo	2018-08-18 21:28:43 UTC (rev 23751)
+++ trunk/x11-toolkits/open-motif/distinfo	2018-08-18 21:31:29 UTC (rev 23752)
@@ -1,2 +1,3 @@
-SHA256 (motif-2.3.4-src.tgz) = 637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0
-SIZE (motif-2.3.4-src.tgz) = 9527040
+TIMESTAMP = 1512568346
+SHA256 (motif-2.3.8.tar.gz) = 859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7
+SIZE (motif-2.3.8.tar.gz) = 5704328

Added: trunk/x11-toolkits/open-motif/files/patch-configure.ac
===================================================================
--- trunk/x11-toolkits/open-motif/files/patch-configure.ac	                        (rev 0)
+++ trunk/x11-toolkits/open-motif/files/patch-configure.ac	2018-08-18 21:31:29 UTC (rev 23752)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2012-10-22 16:50:39.000000000 +0200
++++ configure.ac	2014-01-27 22:38:58.000000000 +0100
+@@ -164,7 +164,7 @@
+ if test x$GCC = xyes
+ then
+     CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
+-    if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
++    if ! $CC -v 2>&1 | grep clang > /dev/null && test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
+         CFLAGS="$CFLAGS -fno-tree-ter"
+     fi
+ fi


Property changes on: trunk/x11-toolkits/open-motif/files/patch-configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-toolkits/open-motif/pkg-descr
===================================================================
--- trunk/x11-toolkits/open-motif/pkg-descr	2018-08-18 21:28:43 UTC (rev 23751)
+++ trunk/x11-toolkits/open-motif/pkg-descr	2018-08-18 21:31:29 UTC (rev 23752)
@@ -4,7 +4,7 @@
 vendors with the industry's most widely used environment for standardizing
 application presentation on a wide range of platforms.  Motif is the
 leading user interface toolkit for the UNIX(r) system.
- 
+
 NOTE: Some ports with GNU configure do not know that Motif 2.1 requires -lXp.
 In that case, you need to edit Makefile after configure, or, hack
 configure(.in) before configure.


Property changes on: trunk/x11-toolkits/open-motif/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/x11-toolkits/open-motif/pkg-plist
===================================================================
--- trunk/x11-toolkits/open-motif/pkg-plist	2018-08-18 21:28:43 UTC (rev 23751)
+++ trunk/x11-toolkits/open-motif/pkg-plist	2018-08-18 21:31:29 UTC (rev 23752)
@@ -992,21 +992,17 @@
 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,19 +1014,15 @@
 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
@@ -1037,11 +1029,9 @@
 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.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,13 +1063,11 @@
 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
@@ -1087,12 +1074,10 @@
 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
@@ -1099,13 +1084,11 @@
 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,19 +1133,16 @@
 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
@@ -1169,13 +1149,11 @@
 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.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.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/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/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.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



More information about the Midnightbsd-cvs mailing list