Bugs fixed and sanity has now prevailed in licensing. I've tested this
with a few of the usual suspects on amd64 (xminesweeper, xpdf, xsudoku)
without problems. Test reports on other arch, comments or OKs would be
welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 23 Sep 2012 08:05:53 -0000 1.52
+++ Makefile 25 Oct 2012 12:42:19 -0000
@@ -3,41 +3,40 @@
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/
+# 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:
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/openmotif/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 24 Apr 2010 20:17:13 -0000 1.8
+++ distinfo 25 Oct 2012 12:42:19 -0000
@@ -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
Index: patches/patch-Imakefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-Imakefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Imakefile
--- patches/patch-Imakefile 14 Dec 2009 18:03:36 -0000 1.4
+++ patches/patch-Imakefile 25 Oct 2012 12:42:19 -0000
@@ -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
+--- 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
Index: patches/patch-Makefile_imake-pure
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-Makefile_imake-pure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_imake-pure
--- patches/patch-Makefile_imake-pure 18 Jul 2007 21:41:05 -0000 1.1
+++ patches/patch-Makefile_imake-pure 25 Oct 2012 12:42:19 -0000
@@ -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:
+--- 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.
Index: patches/patch-bindings-Imakefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-bindings-Imakefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bindings-Imakefile
--- patches/patch-bindings-Imakefile 14 Dec 2009 18:03:36 -0000 1.4
+++ patches/patch-bindings-Imakefile 25 Oct 2012 12:42:19 -0000
@@ -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)
+--- 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 \
Index: patches/patch-bitmaps-Imakefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-bitmaps-Imakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bitmaps-Imakefile
--- patches/patch-bitmaps-Imakefile 14 Dec 2009 18:03:36 -0000 1.3
+++ patches/patch-bitmaps-Imakefile 25 Oct 2012 12:42:19 -0000
@@ -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 = \
+--- 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::
Index: patches/patch-clients_mwm_WmFunction_c
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-clients_mwm_WmFunction_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-clients_mwm_WmFunction_c
--- patches/patch-clients_mwm_WmFunction_c 18 Jul 2007 21:41:05 -0000
1.2
+++ patches/patch-clients_mwm_WmFunction_c 25 Oct 2012 12:42:19 -0000
@@ -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 *
+--- 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
}
}
-@@ -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
Index: patches/patch-clients_uil_UilDefI_h
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-clients_uil_UilDefI_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-clients_uil_UilDefI_h
--- patches/patch-clients_uil_UilDefI_h 24 Apr 2010 20:17:13 -0000 1.1
+++ patches/patch-clients_uil_UilDefI_h 25 Oct 2012 12:42:19 -0000
@@ -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);
+--- 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"
Index: patches/patch-config_cf_Motif_rules
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-config_cf_Motif_rules,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_cf_Motif_rules
--- patches/patch-config_cf_Motif_rules 9 Dec 2009 23:21:46 -0000 1.1
+++ patches/patch-config_cf_Motif_rules 25 Oct 2012 12:42:19 -0000
@@ -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
+--- 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
/* 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
@@\
Index: patches/patch-config_cf_Motif_tmpl
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-config_cf_Motif_tmpl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_cf_Motif_tmpl
--- patches/patch-config_cf_Motif_tmpl 14 Dec 2009 18:03:36 -0000 1.2
+++ patches/patch-config_cf_Motif_tmpl 25 Oct 2012 12:42:19 -0000
@@ -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
+--- 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
#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
Index: patches/patch-demos_lib_Exm_wml_Makefile_am
===================================================================
RCS file: patches/patch-demos_lib_Exm_wml_Makefile_am
diff -N patches/patch-demos_lib_Exm_wml_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-demos_lib_Exm_wml_Makefile_am 25 Oct 2012 12:42:19 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- 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
+- $(RM) $(TARGETS) $(REPORT) wml-uil.mm
++ -$(RM) $(TARGETS) $(REPORT) wml-uil.mm
+ # $(YACC) -d $(YACCFLAGS) $(UILY)
+ # $(MV) y.tab.c UilLexPars.c
+ # $(MV) y.tab.h UilLexPars.h
+ $(top_builddir)/tools/wml/wmluiltok < $(UILY) > tokens.dat
+ # $(RM) wml-uil.mm
+- $(RM) Exm.h
++ -$(RM) Exm.h
+ $(LN_S) $(srcdir)/$(TABLE) ./Exm.h
+ $(CPP) -I$(WMLDIR) Exm.h | $(top_builddir)/tools/wml/wml
+- $(RM) Exm.h
++ -$(RM) Exm.h
+ # $(RM) tokens.dat
+ #
+ # $(WMDTABLE): wmldbcreate
Index: patches/patch-demos_lib_Exm_wml_Makefile_in
===================================================================
RCS file: patches/patch-demos_lib_Exm_wml_Makefile_in
diff -N patches/patch-demos_lib_Exm_wml_Makefile_in
--- patches/patch-demos_lib_Exm_wml_Makefile_in 24 Apr 2010 20:17:13 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$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)
- UilLexPars.c UilLexPars.h: $(UILY)
-
- $(TARGETS): $(TABLE) $(WMLDIR)/motif.wml
-- $(RM) $(TARGETS) $(REPORT) wml-uil.mm
-+ -$(RM) $(TARGETS) $(REPORT) wml-uil.mm
- # $(YACC) -d $(YACCFLAGS) $(UILY)
- # $(MV) y.tab.c UilLexPars.c
- # $(MV) y.tab.h UilLexPars.h
- $(top_builddir)/tools/wml/wmluiltok < $(UILY) > tokens.dat
- # $(RM) wml-uil.mm
-- $(RM) Exm.h
-+ -$(RM) Exm.h
- $(LN_S) $(srcdir)/$(TABLE) ./Exm.h
- $(CPP) -I$(WMLDIR) Exm.h | $(top_builddir)/tools/wml/wml
-- $(RM) Exm.h
-+ -$(RM) Exm.h
- # $(RM) tokens.dat
- #
- # $(WMDTABLE): wmldbcreate
Index: patches/patch-demos_programs_Imakefile
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-demos_programs_Imakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-demos_programs_Imakefile
--- patches/patch-demos_programs_Imakefile 14 Dec 2009 18:03:36 -0000
1.3
+++ patches/patch-demos_programs_Imakefile 25 Oct 2012 12:42:19 -0000
@@ -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 \
+--- 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 \
Index: patches/patch-demos_programs_workspace_wsmData_c
===================================================================
RCS file:
/cvs/ports/x11/openmotif/patches/patch-demos_programs_workspace_wsmData_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-demos_programs_workspace_wsmData_c
--- patches/patch-demos_programs_workspace_wsmData_c 31 Aug 2010 21:04:06
-0000 1.1
+++ patches/patch-demos_programs_workspace_wsmData_c 25 Oct 2012 12:42:19
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-demos_programs_workspace
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>
Index: patches/patch-demos_programs_workspace_xrmLib_c
===================================================================
RCS file:
/cvs/ports/x11/openmotif/patches/patch-demos_programs_workspace_xrmLib_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-demos_programs_workspace_xrmLib_c
--- patches/patch-demos_programs_workspace_xrmLib_c 31 Aug 2010 21:04:06
-0000 1.1
+++ patches/patch-demos_programs_workspace_xrmLib_c 25 Oct 2012 12:42:19
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-demos_programs_workspace
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>
Index: patches/patch-demos_unsupported_motifshell_motifshell_c
===================================================================
RCS file:
/cvs/ports/x11/openmotif/patches/patch-demos_unsupported_motifshell_motifshell_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-demos_unsupported_motifshell_motifshell_c
--- patches/patch-demos_unsupported_motifshell_motifshell_c 18 Jul 2007
21:41:05 -0000 1.2
+++ patches/patch-demos_unsupported_motifshell_motifshell_c 25 Oct 2012
12:42:19 -0000
@@ -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
+--- 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_motifs
/* 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
}
Index: patches/patch-demos_unsupported_xmform_xmform_c
===================================================================
RCS file:
/cvs/ports/x11/openmotif/patches/patch-demos_unsupported_xmform_xmform_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-demos_unsupported_xmform_xmform_c
--- patches/patch-demos_unsupported_xmform_xmform_c 31 Aug 2010 21:04:06
-0000 1.1
+++ patches/patch-demos_unsupported_xmform_xmform_c 25 Oct 2012 12:42:19
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-demos_unsupported_xmform
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
***-------------------------------------------------------------------*/
Index: patches/patch-lib_Xm_Makefile_in
===================================================================
RCS file: patches/patch-lib_Xm_Makefile_in
diff -N patches/patch-lib_Xm_Makefile_in
--- patches/patch-lib_Xm_Makefile_in 24 Apr 2010 20:17:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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@
Index: patches/patch-lib_Xm_Scale_c
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-lib_Xm_Scale_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Xm_Scale_c
--- patches/patch-lib_Xm_Scale_c 9 Dec 2009 23:21:46 -0000 1.1
+++ patches/patch-lib_Xm_Scale_c 25 Oct 2012 12:42:19 -0000
@@ -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(
+--- 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 200
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;
Index: patches/patch-lib_Xm_TextFunc_c
===================================================================
RCS file: /cvs/ports/x11/openmotif/patches/patch-lib_Xm_TextFunc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Xm_TextFunc_c
--- patches/patch-lib_Xm_TextFunc_c 22 Jun 2011 17:22:37 -0000 1.1
+++ patches/patch-lib_Xm_TextFunc_c 25 Oct 2012 12:42:19 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-lib_Xm_TextFunc_c,v 1.1
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);
Index: patches/patch-tools_wml_Makefile_am
===================================================================
RCS file: patches/patch-tools_wml_Makefile_am
diff -N patches/patch-tools_wml_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_wml_Makefile_am 25 Oct 2012 12:42:19 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- 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
+
Index: patches/patch-tools_wml_Makefile_in
===================================================================
RCS file: patches/patch-tools_wml_Makefile_in
diff -N patches/patch-tools_wml_Makefile_in
--- patches/patch-tools_wml_Makefile_in 24 Apr 2010 20:17:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
-
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/openmotif/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 23 Sep 2012 08:05:53 -0000 1.5
+++ pkg/PLIST-main 25 Oct 2012 12:42:19 -0000
@@ -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%%
Index: pkg/README-main
===================================================================
RCS file: pkg/README-main
diff -N pkg/README-main
--- pkg/README-main 2 Jun 2011 13:41:42 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.
