summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/yacl/Makefile8
-rw-r--r--devel/yacl/files/patch-af20
-rw-r--r--devel/yacl/files/patch-ag11
-rw-r--r--devel/yacl/files/patch-ah15
-rw-r--r--devel/yacl/files/patch-ai67
5 files changed, 117 insertions, 4 deletions
diff --git a/devel/yacl/Makefile b/devel/yacl/Makefile
index d9fb7a544ae8..4f309ec3f0be 100644
--- a/devel/yacl/Makefile
+++ b/devel/yacl/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= albast@xs4all.nl
USE_ZIP= yes
WRKSRC= ${WRKDIR}
-MAKE_ENV= YACLPATH=${WRKDIR}
+MAKE_ENV+= YACLPATH=${WRKDIR}
MAKEFILE= gnuc.mak
ALL_TARGET= yacl
@@ -23,8 +23,8 @@ ALL_TARGET= yacl
REQUIRES_MOTIF= true
post-build:
- @(cd ${WRKSRC}/apps/bmpview; YACLPATH=${WRKDIR} $(MAKE) -f gnuc.mak)
- @(cd ${WRKSRC}/apps/dlged; YACLPATH=${WRKDIR} $(MAKE) -f gnuc.mak)
+ @(cd ${WRKSRC}/apps/bmpview; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
+ @(cd ${WRKSRC}/apps/dlged; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
do-install:
# don't split up base directory; keep compilation semantics.
@@ -44,7 +44,7 @@ do-install:
@( cd ${PREFIX}/share/yacl; ${LN} -s ${PREFIX}/lib/yacl lib; \
${LN} -s ${PREFIX}/include/yacl/io; ${LN} -s ${PREFIX}/include/yacl/ui )
@${ECHO} "Done. Don't forget to set your YACLPATH environment "
- @${ECHO} -n "variable to ${PREFIX}/share/yacl!"
+ @${ECHO} "variable to ${PREFIX}/share/yacl!"
post-install:
@strip ${PREFIX}/share/yacl/apps/bmpview
diff --git a/devel/yacl/files/patch-af b/devel/yacl/files/patch-af
new file mode 100644
index 000000000000..6c735dc1fd3a
--- /dev/null
+++ b/devel/yacl/files/patch-af
@@ -0,0 +1,20 @@
+--- ui/font.cxx.orig Sun Feb 27 11:49:09 2000
++++ ui/font.cxx Sun Feb 27 11:51:34 2000
+@@ -60,7 +60,7 @@
+ // Local id zero is always in use.
+ #endif
+
+-static const DEFAULT_POINT_SIZE = 11;
++static const int DEFAULT_POINT_SIZE = 11;
+ static const double PTS_PER_INCH = 72.24;
+
+ #if defined (__MS_WINDOWS__) || defined(__MS_WIN32__)
+@@ -217,7 +217,7 @@
+ static XtResource resources[] = {
+ { "font", "Font", XtRString, sizeof (String),
+ XtOffset (Value*, font ),
+- XtRString, "fixed" }
++ XtRString, (void *)"fixed" }
+ };
+ Widget shell = YACLApp()->Controller().RootShell();
+ if (shell)
diff --git a/devel/yacl/files/patch-ag b/devel/yacl/files/patch-ag
new file mode 100644
index 000000000000..f7ab905549bd
--- /dev/null
+++ b/devel/yacl/files/patch-ag
@@ -0,0 +1,11 @@
+--- ui/scrolwin.cxx.orig Sun Feb 27 11:52:49 2000
++++ ui/scrolwin.cxx Sun Feb 27 11:53:15 2000
+@@ -50,7 +50,7 @@
+ };
+
+ #if defined(__X_MOTIF__)
+-static const SCROLL_BAR_WIDTH = 12;
++static const int SCROLL_BAR_WIDTH = 12;
+ #endif
+
+ UIPriv_Scroller::UIPriv_Scroller (UI_ScrollableWindow* parent,
diff --git a/devel/yacl/files/patch-ah b/devel/yacl/files/patch-ah
new file mode 100644
index 000000000000..ea70850ab00c
--- /dev/null
+++ b/devel/yacl/files/patch-ah
@@ -0,0 +1,15 @@
+--- apps/bmpview/menudrv.cxx.orig Sun Feb 27 11:56:29 2000
++++ apps/bmpview/menudrv.cxx Sun Feb 27 11:57:27 2000
+@@ -39,9 +39,9 @@
+ MenuBinding::MethodPtr method;
+ UI_EventType event;
+ } FAR dispatch [] = {
+- {ID_OPEN, MenuDriver::OpenFile, Event_Select}
+- , {ID_ABOUT, MenuDriver::About, Event_Select}
+- , {ID_QUIT, MenuDriver::Quit, Event_Select}
++ {ID_OPEN, &MenuDriver::OpenFile, Event_Select}
++ , {ID_ABOUT, &MenuDriver::About, Event_Select}
++ , {ID_QUIT, &MenuDriver::Quit, Event_Select}
+ };
+
+
diff --git a/devel/yacl/files/patch-ai b/devel/yacl/files/patch-ai
new file mode 100644
index 000000000000..5179b2613a91
--- /dev/null
+++ b/devel/yacl/files/patch-ai
@@ -0,0 +1,67 @@
+--- apps/dlged/menudrv.cxx.orig Sun Feb 27 12:05:50 2000
++++ apps/dlged/menudrv.cxx Sun Feb 27 12:06:36 2000
+@@ -47,37 +47,37 @@
+ MenuBinding::MethodPtr method;
+ UI_EventType event;
+ } FAR dispatch [] = {
+- {ID_NEW, MenuDriver::CatchAll, Event_Select}
+- , {ID_OPEN, MenuDriver::CatchAll, Event_Select}
+- , {ID_SAVEAS, MenuDriver::CatchAll, Event_Select}
+- , {ID_FONT, MenuDriver::CatchAll, Event_Select}
+- , {ID_TESTDLG, MenuDriver::CatchAll, Event_Select}
+- , {ID_QUIT, MenuDriver::Quit, Event_Select}
++ {ID_NEW, &MenuDriver::CatchAll, Event_Select}
++ , {ID_OPEN, &MenuDriver::CatchAll, Event_Select}
++ , {ID_SAVEAS, &MenuDriver::CatchAll, Event_Select}
++ , {ID_FONT, &MenuDriver::CatchAll, Event_Select}
++ , {ID_TESTDLG, &MenuDriver::CatchAll, Event_Select}
++ , {ID_QUIT, &MenuDriver::Quit, Event_Select}
+
+- , {ID_CUT, MenuDriver::CatchAll, Event_Select}
+- , {ID_COPY, MenuDriver::CatchAll, Event_Select}
+- , {ID_PASTE, MenuDriver::CatchAll, Event_Select}
+- , {ID_DELETE, MenuDriver::CatchAll, Event_Select}
+- , {ID_REPL, MenuDriver::CatchAll, Event_Select}
+- , {ID_ALIGN, MenuDriver::CatchAll, Event_Select}
+- , {ID_SIZE, MenuDriver::CatchAll, Event_Select}
+- , {ID_PROP, MenuDriver::CatchAll, Event_Select}
++ , {ID_CUT, &MenuDriver::CatchAll, Event_Select}
++ , {ID_COPY, &MenuDriver::CatchAll, Event_Select}
++ , {ID_PASTE, &MenuDriver::CatchAll, Event_Select}
++ , {ID_DELETE, &MenuDriver::CatchAll, Event_Select}
++ , {ID_REPL, &MenuDriver::CatchAll, Event_Select}
++ , {ID_ALIGN, &MenuDriver::CatchAll, Event_Select}
++ , {ID_SIZE, &MenuDriver::CatchAll, Event_Select}
++ , {ID_PROP, &MenuDriver::CatchAll, Event_Select}
+
+
+- , {ID_LABEL, MenuDriver::Choose, Event_Select}
+- , {ID_PUSHBN, MenuDriver::Choose, Event_Select}
+- , {ID_STRVW, MenuDriver::Choose, Event_Select}
+- , {ID_STRED, MenuDriver::Choose, Event_Select}
+- , {ID_TGLBN, MenuDriver::Choose, Event_Select}
+- , {ID_COMBO, MenuDriver::Choose, Event_Select}
+- , {ID_HSCRL, MenuDriver::Choose, Event_Select}
+- , {ID_VSCRL, MenuDriver::Choose, Event_Select}
+- , {ID_TEXT, MenuDriver::Choose, Event_Select}
+- , {ID_ORGRP, MenuDriver::Choose, Event_Select}
+- , {ID_XRGRP, MenuDriver::Choose, Event_Select}
+- , {ID_XRTGL, MenuDriver::Choose, Event_Select}
++ , {ID_LABEL, &MenuDriver::Choose, Event_Select}
++ , {ID_PUSHBN, &MenuDriver::Choose, Event_Select}
++ , {ID_STRVW, &MenuDriver::Choose, Event_Select}
++ , {ID_STRED, &MenuDriver::Choose, Event_Select}
++ , {ID_TGLBN, &MenuDriver::Choose, Event_Select}
++ , {ID_COMBO, &MenuDriver::Choose, Event_Select}
++ , {ID_HSCRL, &MenuDriver::Choose, Event_Select}
++ , {ID_VSCRL, &MenuDriver::Choose, Event_Select}
++ , {ID_TEXT, &MenuDriver::Choose, Event_Select}
++ , {ID_ORGRP, &MenuDriver::Choose, Event_Select}
++ , {ID_XRGRP, &MenuDriver::Choose, Event_Select}
++ , {ID_XRTGL, &MenuDriver::Choose, Event_Select}
+
+- , {ID_ABOUT, MenuDriver::About, Event_Select}
++ , {ID_ABOUT, &MenuDriver::About, Event_Select}
+
+ };
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:56:27 +0000