cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Motif 2.3.4, which is now released under LGPLv2.1.

Browse Source 
"Motif 2.3.4 is an updated version of Open Motif 2.3 and is a major
bug fix release."

Keeping current package naming (openmotif) for now.
Feedback from pascal@ naddy@
This commit is contained in:
sthen 2012-10-28 11:05:44 +00:00
parent beb05ae5cc
commit 6b69e3097d
23 changed files with 114 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
x11/openmotif/Makefile
View File

@ -1,43 +1,42 @@
# $OpenBSD: Makefile,v 1.52 2012/09/23 08:05:53 matthieu Exp $
# $OpenBSD: Makefile,v 1.53 2012/10/28 11:05:44 sthen Exp $
COMMENT-main= Motif toolkit
COMMENT-demos= Motif toolkit demos
VERSION= 2.3.3
DISTNAME= openmotif-${VERSION}
VERSION= 2.3.4
DISTNAME= motif-${VERSION}
EXTRACT_SUFX= -src.tgz
PKGNAME-main= openmotif-${VERSION}
PKGNAME-demos= openmotif-demos-${VERSION}
REVISION-main= 4
REVISION-demos= 2
SHARED_LIBS= Mrm 4.1 \
Uil 5.0 \
Xm 6.0
CATEGORIES= x11
#MASTER_SITES= ftp://ftp.ics.com/openmotif/2.3/${VERSION}/
MASTER_SITES= http://distfiles.nl/ \
ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/openmotif/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=motif/}
DIST_SUBDIR= openmotif
HOMEPAGE= http://www.opengroup.org/openmotif/
HOMEPAGE= http://motif.ics.com/
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -demos -main
MULTI_PACKAGES= -demos -main
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.12
CONFIGURE_ARGS= --enable-themes \
--enable-xft \
--enable-jpeg \
--disable-printing \
--enable-png
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib -lm"
USE_LIBTOOL= Yes
@ -54,14 +53,17 @@ LIB_DEPENDS= graphics/jpeg \
LIB_DEPENDS-demos= x11/openmotif \
${MODLIBICONV_LIB_DEPENDS} \
${LIB_DEPENDS}
WANTLIB= ICE SM X11 Xext Xt c Xau Xdmcp Xft Xmu Xrender \
expat fontconfig freetype m z pthread-stubs xcb \
WANTLIB= ICE SM X11 Xext Xt c Xft Xmu Xrender \
expat fontconfig freetype m z xcb \
jpeg png
WANTLIB-demos= ${WANTLIB} Xm Mrm
# XXX Large, complicated, only partially automated test suite available
NO_REGRESS= Yes
post-patch:
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
pre-configure:
# fix sections
@cd ${WRKSRC}/doc/man/man1 && perl -pi -e "s|user cmd|1|" *.1
@ -77,9 +79,10 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/config/cf/host.def \
${WRKSRC}/config/cf/Motif.tmpl \
${WRKSRC}/lib/Xm/Makefile.in
${WRKSRC}/lib/Xm/Makefile.am
DOCS=BUGREPORT COPYING README RELEASE RELNOTES TODO
DOCS=BUGREPORT COPYRIGHT.MOTIF LICENSE README RELEASE RELNOTES TODO
DOCDIR=${PREFIX}/share/doc/openmotif
post-install:

7
x11/openmotif/distinfo
View File

@ -1,5 +1,2 @@
MD5 (openmotif/openmotif-2.3.3.tar.gz) = /SfNM2nWx9XveezLpST3vg==
RMD160 (openmotif/openmotif-2.3.3.tar.gz) = AVMj4hLpHqO+rwOVk95bp1sB5KY=
SHA1 (openmotif/openmotif-2.3.3.tar.gz) = KlHi8oB4xNt/8MhRfrJXABcWtpk=
SHA256 (openmotif/openmotif-2.3.3.tar.gz) = yF9VReIY+gxZo3iRkhMtRy/Foz6RSiIaVo7uT8EM0QM=
SIZE (openmotif/openmotif-2.3.3.tar.gz) = 6051202
SHA256 (openmotif/motif-2.3.4-src.tgz) = Y376CWCOC4+TRl2+t8kuWOuxTEvBtIgEDreaZa8+++A=
SIZE (openmotif/motif-2.3.4-src.tgz) = 9527040

8
x11/openmotif/patches/patch-Imakefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.4 2009/12/14 18:03:36 jasper Exp $
--- Imakefile.orig Sat Jun 30 09:54:52 2007
+++ Imakefile Sat Jun 30 09:55:15 2007
@@ -90,7 +90,7 @@ XCOMM
$OpenBSD: patch-Imakefile,v 1.5 2012/10/28 11:05:45 sthen Exp $
--- Imakefile.orig Mon Oct 22 15:50:39 2012
+++ Imakefile Wed Oct 24 21:18:51 2012
@@ -77,7 +77,7 @@ XCOMM
#ifdef UseInstalled
TESTS_IMAKE = $(IMAKE) -DUseInstalled
#else

8
x11/openmotif/patches/patch-Makefile_imake-pure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_imake-pure,v 1.1 2007/07/18 21:41:05 mbalmer Exp $
--- Makefile.imake-pure.orig Sat Jun 30 09:55:02 2007
+++ Makefile.imake-pure Sat Jun 30 09:55:55 2007
@@ -115,7 +115,12 @@ World:
$OpenBSD: patch-Makefile_imake-pure,v 1.2 2012/10/28 11:05:45 sthen Exp $
--- Makefile.imake-pure.orig Mon Oct 22 15:50:39 2012
+++ Makefile.imake-pure Wed Oct 24 21:18:52 2012
@@ -99,7 +99,12 @@ World:
# This is just a sequence of bootstrapping steps we have to do.
# The steps are listed as separate targets so clearmake can wink in
# the Makefile.proto files.

8
x11/openmotif/patches/patch-bindings-Imakefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bindings-Imakefile,v 1.4 2009/12/14 18:03:36 jasper Exp $
--- bindings/Imakefile.orig Sat Jun 30 09:56:21 2007
+++ bindings/Imakefile Sat Jun 30 09:56:48 2007
@@ -41,6 +41,7 @@ INSTALLFLAGS = $(INSTINCFLAGS)
$OpenBSD: patch-bindings-Imakefile,v 1.5 2012/10/28 11:05:45 sthen Exp $
--- bindings/Imakefile.orig Mon Oct 22 15:50:39 2012
+++ bindings/Imakefile Wed Oct 24 21:18:52 2012
@@ -28,6 +28,7 @@ INSTALLFLAGS = $(INSTINCFLAGS)
FILES = \
xmbind.alias \

8
x11/openmotif/patches/patch-bitmaps-Imakefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bitmaps-Imakefile,v 1.3 2009/12/14 18:03:36 jasper Exp $
--- bitmaps/Imakefile.orig Sat Jun 30 10:01:51 2007
+++ bitmaps/Imakefile Sat Jun 30 10:02:28 2007
@@ -56,4 +56,4 @@ HEADERS = \
$OpenBSD: patch-bitmaps-Imakefile,v 1.4 2012/10/28 11:05:45 sthen Exp $
--- bitmaps/Imakefile.orig Mon Oct 22 15:50:39 2012
+++ bitmaps/Imakefile Wed Oct 24 21:18:52 2012
@@ -43,4 +43,4 @@ HEADERS = \
all::

10
x11/openmotif/patches/patch-clients_mwm_WmFunction_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clients_mwm_WmFunction_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $
--- clients/mwm/WmFunction.c.orig Sat Jun 30 10:04:45 2007
+++ clients/mwm/WmFunction.c Sat Jun 30 10:05:44 2007
@@ -1126,12 +1126,12 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *
$OpenBSD: patch-clients_mwm_WmFunction_c,v 1.3 2012/10/28 11:05:45 sthen Exp $
--- clients/mwm/WmFunction.c.orig Mon Oct 22 15:50:39 2012
+++ clients/mwm/WmFunction.c Wed Oct 24 21:18:52 2012
@@ -1113,12 +1113,12 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *
directory, then we must call execlp and not execl
*/
shellname = shell;
@ -16,7 +16,7 @@ $OpenBSD: patch-clients_mwm_WmFunction_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $
}
}
@@ -1140,9 +1140,9 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *
@@ -1127,9 +1127,9 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *
* Try /bin/sh .
*/
#ifdef SVR4

15
x11/openmotif/patches/patch-clients_uil_UilDefI_h
View File

@ -1,13 +1,12 @@
$OpenBSD: patch-clients_uil_UilDefI_h,v 1.1 2010/04/24 20:17:13 naddy Exp $
--- clients/uil/UilDefI.h.orig Fri Apr 23 20:23:04 2010
+++ clients/uil/UilDefI.h Fri Apr 23 20:23:23 2010
@@ -283,9 +283,7 @@ extern char* uil_mmove(char*, char*, int);
$OpenBSD: patch-clients_uil_UilDefI_h,v 1.2 2012/10/28 11:05:45 sthen Exp $
--- clients/uil/UilDefI.h.orig Mon Oct 22 15:50:39 2012
+++ clients/uil/UilDefI.h Wed Oct 24 21:19:42 2012
@@ -270,7 +270,7 @@ extern char* uil_mmove(char*, char*, int);
#include "UilIODef.h"
#include "UilDiagDef.h"
#include "UilSarDef.h"
-#if defined(linux)
-#if defined(linux) || defined(__APPLE__)
+#if defined(linux) || defined(__APPLE__) || defined(__OpenBSD__)
#define YYSTYPE yystype
-#endif
#endif
#include "UilLexPars.h"
#include "UilCmdDef.h"
#include "UilLexDef.h"

10
x11/openmotif/patches/patch-config_cf_Motif_rules
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_cf_Motif_rules,v 1.1 2009/12/09 23:21:46 jasper Exp $
--- config/cf/Motif.rules.orig Sat Jan 5 16:20:49 2002
+++ config/cf/Motif.rules Thu Dec 10 00:20:05 2009
@@ -50,10 +50,10 @@ XCOMM $TOG: Motif.rules /main/8 1999/03/22 15:12:48 mg
$OpenBSD: patch-config_cf_Motif_rules,v 1.2 2012/10/28 11:05:45 sthen Exp $
--- config/cf/Motif.rules.orig Mon Oct 22 15:50:39 2012
+++ config/cf/Motif.rules Wed Oct 24 21:18:52 2012
@@ -38,10 +38,10 @@ XCOMM $TOG: Motif.rules /main/8 1999/03/22 15:12:48 mg
# define MotifIsTopLevelProject NO
#endif
@ -14,7 +14,7 @@ $OpenBSD: patch-config_cf_Motif_rules,v 1.1 2009/12/09 23:21:46 jasper Exp $
/* Use the in-tree Motif by default. */
#ifndef UseInstalledMotif
# define UseInstalledMotif NO
@@ -698,7 +698,7 @@ clean:: @@\
@@ -686,7 +686,7 @@ clean:: @@\
#define Real_MessageCatalogRule(prefix) @@\
prefix.cat Concat(prefix,MsgCatI.h): @@\
$(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\

10
x11/openmotif/patches/patch-config_cf_Motif_tmpl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_cf_Motif_tmpl,v 1.2 2009/12/14 18:03:36 jasper Exp $
--- config/cf/Motif.tmpl.orig Sat Jan 5 16:20:50 2002
+++ config/cf/Motif.tmpl Thu Dec 10 00:20:05 2009
@@ -179,7 +179,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr
$OpenBSD: patch-config_cf_Motif_tmpl,v 1.3 2012/10/28 11:05:45 sthen Exp $
--- config/cf/Motif.tmpl.orig Mon Oct 22 15:50:39 2012
+++ config/cf/Motif.tmpl Wed Oct 24 21:18:52 2012
@@ -167,7 +167,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr
# define YaccFlags /**/
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-config_cf_Motif_tmpl,v 1.2 2009/12/14 18:03:36 jasper Exp $
#ifndef BuildMotifConfig
# define BuildMotifConfig YES
@@ -396,7 +396,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr
@@ -384,7 +384,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgr
/* hardcoded default path. Contrary to the original duplicate of USRLIBDIR
in the Imakefiles. */
#ifndef VirtualBindingsPath

8
x11/openmotif/patches/patch-demos_lib_Exm_wml_Makefile_in → x11/openmotif/patches/patch-demos_lib_Exm_wml_Makefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_lib_Exm_wml_Makefile_in,v 1.3 2010/04/24 20:17:13 naddy Exp $
--- demos/lib/Exm/wml/Makefile.in.orig Fri Mar 12 15:44:32 2010
+++ demos/lib/Exm/wml/Makefile.in Fri Apr 23 17:26:03 2010
@@ -561,16 +561,16 @@ $(WMDTABLE): wmldbcreate $(TARGETS)
$OpenBSD: patch-demos_lib_Exm_wml_Makefile_am,v 1.1 2012/10/28 11:05:45 sthen Exp $
--- demos/lib/Exm/wml/Makefile.am.orig Wed Oct 24 21:22:30 2012
+++ demos/lib/Exm/wml/Makefile.am Wed Oct 24 21:22:40 2012
@@ -61,16 +61,16 @@ TARGETS = $(YACCTARGETS) $(WMLTARGETS)
UilLexPars.c UilLexPars.h: $(UILY)
$(TARGETS): $(TABLE) $(WMLDIR)/motif.wml

8
x11/openmotif/patches/patch-demos_programs_Imakefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_programs_Imakefile,v 1.3 2009/12/14 18:03:36 jasper Exp $
--- demos/programs/Imakefile.orig Tue Jan 29 18:22:33 2002
+++ demos/programs/Imakefile Sat Jun 30 10:26:55 2007
@@ -57,7 +57,6 @@ SUBDIRS = airport \
$OpenBSD: patch-demos_programs_Imakefile,v 1.4 2012/10/28 11:05:45 sthen Exp $
--- demos/programs/Imakefile.orig Mon Oct 22 15:50:38 2012
+++ demos/programs/Imakefile Wed Oct 24 21:18:59 2012
@@ -44,7 +44,6 @@ SUBDIRS = airport \
sampler2_0 \
setdate \
Exm \

8
x11/openmotif/patches/patch-demos_programs_workspace_wsmData_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-demos_programs_workspace_wsmData_c,v 1.1 2010/08/31 21:04:06 jasper Exp $
$OpenBSD: patch-demos_programs_workspace_wsmData_c,v 1.2 2012/10/28 11:05:45 sthen Exp $
Fix implicit declaration.
--- demos/programs/workspace/wsmData.c.orig Tue Aug 31 22:53:35 2010
+++ demos/programs/workspace/wsmData.c Tue Aug 31 22:53:52 2010
@@ -42,6 +42,7 @@ static char rcsid[] = "$XConsortium: wsmData.c /main/6
--- demos/programs/workspace/wsmData.c.orig Mon Oct 22 15:50:38 2012
+++ demos/programs/workspace/wsmData.c Wed Oct 24 21:18:59 2012
@@ -29,6 +29,7 @@ static char rcsid[] = "$XConsortium: wsmData.c /main/6
#endif
#endif
#include <stdio.h>

8
x11/openmotif/patches/patch-demos_programs_workspace_xrmLib_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-demos_programs_workspace_xrmLib_c,v 1.1 2010/08/31 21:04:06 jasper Exp $
$OpenBSD: patch-demos_programs_workspace_xrmLib_c,v 1.2 2012/10/28 11:05:45 sthen Exp $
Fix implicit declaration.
--- demos/programs/workspace/xrmLib.c.orig Tue Aug 31 22:54:13 2010
+++ demos/programs/workspace/xrmLib.c Tue Aug 31 22:54:27 2010
@@ -43,6 +43,7 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6
--- demos/programs/workspace/xrmLib.c.orig Mon Oct 22 15:50:38 2012
+++ demos/programs/workspace/xrmLib.c Wed Oct 24 21:18:59 2012
@@ -30,6 +30,7 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6
#endif
#include <stdio.h>

10
x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.2 2007/07/18 21:41:05 mbalmer Exp $
--- demos/unsupported/motifshell/motifshell.c.orig Tue Jan 29 17:16:39 2002
+++ demos/unsupported/motifshell/motifshell.c Sat Jun 30 10:27:21 2007
@@ -598,7 +598,7 @@ void SysCall (Widget widget, char *systemCommand, Bool
$OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.3 2012/10/28 11:05:45 sthen Exp $
--- demos/unsupported/motifshell/motifshell.c.orig Mon Oct 22 15:50:38 2012
+++ demos/unsupported/motifshell/motifshell.c Wed Oct 24 21:18:59 2012
@@ -585,7 +585,7 @@ void SysCall (Widget widget, char *systemCommand, Bool
if ((p = fork()) == 0)
{
/* note - execlp uses PATH */
@ -10,7 +10,7 @@ $OpenBSD: patch-demos_unsupported_motifshell_motifshell_c,v 1.2 2007/07/18 21:41
/* if we fail to find the systemCommand, use 'find' to look for it. */
fprintf(stderr, "can't find %s\n", systemCommand);
@@ -629,7 +629,7 @@ void SysCall (Widget widget, char *systemCommand, Bool
@@ -616,7 +616,7 @@ void SysCall (Widget widget, char *systemCommand, Bool
setenv("UIDPATH", uidpath, 1);
#endif
}

8
x11/openmotif/patches/patch-demos_unsupported_xmform_xmform_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-demos_unsupported_xmform_xmform_c,v 1.1 2010/08/31 21:04:06 jasper Exp $
$OpenBSD: patch-demos_unsupported_xmform_xmform_c,v 1.2 2012/10/28 11:05:45 sthen Exp $
Fix implicit declaration.
--- demos/unsupported/xmform/xmform.c.orig Tue Aug 31 22:54:54 2010
+++ demos/unsupported/xmform/xmform.c Tue Aug 31 22:55:09 2010
@@ -63,6 +63,7 @@ xmform*topShadowColor: white
--- demos/unsupported/xmform/xmform.c.orig Mon Oct 22 15:50:38 2012
+++ demos/unsupported/xmform/xmform.c Wed Oct 24 21:18:59 2012
@@ -50,6 +50,7 @@ xmform*topShadowColor: white
xmform*bottomShadowColor: black
***-------------------------------------------------------------------*/

22
x11/openmotif/patches/patch-lib_Xm_Makefile_in
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-lib_Xm_Makefile_in,v 1.3 2010/04/24 20:17:13 naddy Exp $
--- lib/Xm/Makefile.in.orig Fri Apr 23 17:21:51 2010
+++ lib/Xm/Makefile.in Fri Apr 23 17:22:47 2010
@@ -178,7 +178,8 @@ libXm_la_OBJECTS = $(am_libXm_la_OBJECTS)
libXm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libXm_la_LDFLAGS) \
$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include \
+ -I${PREFIX}/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
@@ -263,7 +264,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -L${LOCALBASE}/lib -liconv
LIBTOOL = @LIBTOOL@
LIB_XP = @LIB_XP@
LIPO = @LIPO@

10
x11/openmotif/patches/patch-lib_Xm_Scale_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Xm_Scale_c,v 1.1 2009/12/09 23:21:46 jasper Exp $
--- lib/Xm/Scale.c.orig Sat May 7 09:11:14 2005
+++ lib/Xm/Scale.c Thu Dec 10 00:20:05 2009
@@ -2808,7 +2808,11 @@ GetValueString(
$OpenBSD: patch-lib_Xm_Scale_c,v 1.2 2012/10/28 11:05:45 sthen Exp $
--- lib/Xm/Scale.c.orig Mon Oct 22 15:50:34 2012
+++ lib/Xm/Scale.c Wed Oct 24 21:19:02 2012
@@ -2834,7 +2834,11 @@ GetValueString(
{
register int i;
int diff, dec_point_size;
@ -13,7 +13,7 @@ $OpenBSD: patch-lib_Xm_Scale_c,v 1.1 2009/12/09 23:21:46 jasper Exp $
if (sw->scale.decimal_points > 0) {
/* Add one to decimal points to get leading zero, since
@@ -2816,15 +2820,23 @@ GetValueString(
@@ -2842,15 +2846,23 @@ GetValueString(
sprintf (buffer,"%.*d", sw->scale.decimal_points+1, value);
diff = strlen(buffer) - sw->scale.decimal_points;

8
x11/openmotif/patches/patch-lib_Xm_TextFunc_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-lib_Xm_TextFunc_c,v 1.1 2011/06/22 17:22:37 sebastia Exp $
$OpenBSD: patch-lib_Xm_TextFunc_c,v 1.2 2012/10/28 11:05:45 sthen Exp $
fix for build with gcc-2.95
--- lib/Xm/TextFunc.c.orig Tue Jun 21 19:11:59 2011
+++ lib/Xm/TextFunc.c Tue Jun 21 19:22:23 2011
@@ -500,18 +500,19 @@ XmTextPaste(Widget widget)
--- lib/Xm/TextFunc.c.orig Mon Oct 22 15:50:34 2012
+++ lib/Xm/TextFunc.c Wed Oct 24 21:19:02 2012
@@ -487,18 +487,19 @@ XmTextPaste(Widget widget)
if (XmIsTextField(widget))
return XmTextFieldPaste(widget);

18
x11/openmotif/patches/patch-tools_wml_Makefile_am Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-tools_wml_Makefile_am,v 1.1 2012/10/28 11:05:45 sthen Exp $
--- tools/wml/Makefile.am.orig Wed Oct 24 21:24:30 2012
+++ tools/wml/Makefile.am Wed Oct 24 21:24:40 2012
@@ -54,11 +54,11 @@ UilLexPars.c: Uil.c
$(WMLTARGETS): wml-uil.mm
wml-uil.mm: wmluiltok wml UilLexPars.c $(TABLE)
- $(RM) $(WMLTARGETS) wml.report wml-uil.mm
+ -$(RM) $(WMLTARGETS) wml.report wml-uil.mm
./wmluiltok <$(srcdir)/Uil.y >tokens.dat
- $(RM) wml-uil.mm
+ -$(RM) wml-uil.mm
./wml $(srcdir)/$(TABLE)
- $(RM) tokens.dat
+ -$(RM) tokens.dat
all: motif.wmd

18
x11/openmotif/patches/patch-tools_wml_Makefile_in
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tools_wml_Makefile_in,v 1.3 2010/04/24 20:17:13 naddy Exp $
--- tools/wml/Makefile.in.orig Fri Mar 12 15:45:02 2010
+++ tools/wml/Makefile.in Fri Apr 23 17:26:03 2010
@@ -671,11 +671,11 @@ UilLexPars.c: Uil.c
$(LN_S) Uil.c UilLexPars.c
$(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE)
- $(RM) $(WMLTARGETS) wml.report wml-uil.mm
+ -$(RM) $(WMLTARGETS) wml.report wml-uil.mm
./wmluiltok <$(srcdir)/Uil.y >tokens.dat
- $(RM) wml-uil.mm
+ -$(RM) wml-uil.mm
./wml $(srcdir)/$(TABLE)
- $(RM) tokens.dat
+ -$(RM) tokens.dat
all: motif.wmd

6
x11/openmotif/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2012/09/23 08:05:53 matthieu Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2012/10/28 11:05:45 sthen Exp $
@conflict lesstif-*
@pkgpath x11/openmotif
@bin bin/mwm
@ -994,11 +994,9 @@ lib/libXm.la
@man man/man5/WML.5
share/doc/openmotif/
share/doc/openmotif/BUGREPORT
share/doc/openmotif/COPYRIGHT.MOTIF
share/doc/openmotif/LICENSE
share/doc/openmotif/COPYING
share/doc/openmotif/README
share/doc/openmotif/RELEASE
share/doc/openmotif/RELNOTES
share/doc/openmotif/TODO
share/doc/pkg-readmes/${FULLPKGNAME}
%%SHARED%%

12
x11/openmotif/pkg/README-main
View File

@ -1,12 +0,0 @@
$OpenBSD: README-main,v 1.2 2011/06/02 13:41:42 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
The licensing of OpenMotif is a bit weird. The actual copyright refers
to the web site, which is quite nasty, as they can come back and change
the licence when they want.
This port works around that problem by grabbing the licensing at the time
of build and including it in the actual package.