pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/dx Fix standard compliance with regard to mai...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9d37ff81f54a
branches: trunk
changeset: 602663:9d37ff81f54a
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Apr 17 17:44:02 2012 +0000
description:
Fix standard compliance with regard to main. Bump revision.
diffstat:
graphics/dx/Makefile | 4 +-
graphics/dx/distinfo | 21 ++++-
graphics/dx/patches/patch-src_uipp_base_Application.C | 43 ++++++++++
graphics/dx/patches/patch-src_uipp_base_Application.h | 35 ++++++++
graphics/dx/patches/patch-src_uipp_base_IBMApplication.C | 23 +++++
graphics/dx/patches/patch-src_uipp_base_IBMApplication.h | 22 +++++
graphics/dx/patches/patch-src_uipp_dxui_Main.C | 14 +++
graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.C | 14 +++
graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.h | 14 +++
graphics/dx/patches/patch-src_uipp_mb_MBApplication.C | 14 +++
graphics/dx/patches/patch-src_uipp_mb_MBApplication.h | 14 +++
graphics/dx/patches/patch-src_uipp_mb_Main.C | 14 +++
graphics/dx/patches/patch-src_uipp_prompter_GARApplication.C | 14 +++
graphics/dx/patches/patch-src_uipp_prompter_GARApplication.h | 14 +++
graphics/dx/patches/patch-src_uipp_prompter_Main.C | 14 +++
graphics/dx/patches/patch-src_uipp_startup_Main.C | 14 +++
graphics/dx/patches/patch-src_uipp_startup_StartupApplication.C | 14 +++
graphics/dx/patches/patch-src_uipp_startup_StartupApplication.h | 13 +++
graphics/dx/patches/patch-src_uipp_tutor_Main.C | 14 +++
graphics/dx/patches/patch-src_uipp_tutor_TutorApplication.C | 14 +++
graphics/dx/patches/patch-src_uipp_tutor_TutorApplication.h | 14 +++
21 files changed, 354 insertions(+), 3 deletions(-)
diffs (truncated from 453 to 300 lines):
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/Makefile
--- a/graphics/dx/Makefile Tue Apr 17 17:42:33 2012 +0000
+++ b/graphics/dx/Makefile Tue Apr 17 17:44:02 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2012/03/06 23:26:38 joerg Exp $
+# $NetBSD: Makefile,v 1.63 2012/04/17 17:44:02 joerg Exp $
DISTNAME= dx-4.4.4
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= graphics
MASTER_SITES= http://opendx.npaci.edu/source/
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/distinfo
--- a/graphics/dx/distinfo Tue Apr 17 17:42:33 2012 +0000
+++ b/graphics/dx/distinfo Tue Apr 17 17:44:02 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/03/06 23:26:38 joerg Exp $
+$NetBSD: distinfo,v 1.14 2012/04/17 17:44:02 joerg Exp $
SHA1 (dx-4.4.4.tar.gz) = c8e4d72d169675c66acd2135599b211d80810f76
RMD160 (dx-4.4.4.tar.gz) = db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b
@@ -16,3 +16,22 @@
SHA1 (patch-ap) = 960cc73c8a3d42fa2fb1a4cb0bd0f4e3d918babf
SHA1 (patch-ar) = cafb9f3eec34cc3909eea194c644497ad53960ca
SHA1 (patch-ba) = 41d20e76feebdb049729e46ca4240ccc41f51b1d
+SHA1 (patch-src_uipp_base_Application.C) = 2d947d8b40a9da10e4122e6013e29554deb8aeec
+SHA1 (patch-src_uipp_base_Application.h) = 006d80bd4ada9dd2bf06e46a6dc1e120aae54aeb
+SHA1 (patch-src_uipp_base_IBMApplication.C) = f2767b02ae68f173ee1cf239a0de3ceaf148c4e5
+SHA1 (patch-src_uipp_base_IBMApplication.h) = 23fb1c28939945b74cace4c9d5b288c3ca980a0b
+SHA1 (patch-src_uipp_dxui_Main.C) = 003942b7e4792b48c57c730545d8dd7f2d4ba2a0
+SHA1 (patch-src_uipp_dxuilib_DXApplication.C) = c30c07c4a64cdd1714fa106bb395450399202301
+SHA1 (patch-src_uipp_dxuilib_DXApplication.h) = da63ba65de3615da077c0e5cba763ff29c664ef9
+SHA1 (patch-src_uipp_mb_MBApplication.C) = 2e1253c880d8c1c800f3a6f338aa240f30fe5448
+SHA1 (patch-src_uipp_mb_MBApplication.h) = d166a22ade9cfba902a1b5428cbf09ebd165d166
+SHA1 (patch-src_uipp_mb_Main.C) = 6623a5f0bea972c13092df7bd0583b30c28dc435
+SHA1 (patch-src_uipp_prompter_GARApplication.C) = ddb43c7c103f1a20c1ec725f8f5c977c3821eb4b
+SHA1 (patch-src_uipp_prompter_GARApplication.h) = 76d2e0cdd45603692b3fbf1b6a044a0ab93e5e25
+SHA1 (patch-src_uipp_prompter_Main.C) = a47d59c7782e58667fb01bf23318dbf5ba990e5b
+SHA1 (patch-src_uipp_startup_Main.C) = 021356ce0dafd3a3d49229251588a373eaa40bba
+SHA1 (patch-src_uipp_startup_StartupApplication.C) = a0a01c96b83c078d7abae7b1464b685fb87afff0
+SHA1 (patch-src_uipp_startup_StartupApplication.h) = 61fef8f3d67ef90f79e26fe72570c8dfa6aacc37
+SHA1 (patch-src_uipp_tutor_Main.C) = 367af42a93a559fd0f61e74c71241c595f0f5395
+SHA1 (patch-src_uipp_tutor_TutorApplication.C) = bc86b520ff0038d9f551fad7a2a2ff0c7c64dd5d
+SHA1 (patch-src_uipp_tutor_TutorApplication.h) = b0f77603935b49fc867d5d80feef25ca39134e28
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_base_Application.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_base_Application.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_uipp_base_Application.C,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/base/Application.C.orig 2012-04-16 23:44:12.000000000 +0000
++++ src/uipp/base/Application.C
+@@ -136,7 +136,7 @@ void Application::installDefaultResource
+ //this->setDefaultResources(baseWidget, Application::DefaultResources);
+ }
+
+-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean Application::initializeWindowSystem(int *argcp, char **argv)
+ {
+
+ //
+@@ -148,11 +148,7 @@ boolean Application::initializeWindowSys
+ this->applicationClass, // application class name
+ NULL, // command line options table
+ 0, // number of entries in options table
+-#if XtSpecificationRelease > 4
+- (int*)argcp,
+-#else
+ argcp,
+-#endif
+ argv, // "argv" command line arguments
+ #if XtSpecificationRelease > 4
+ NULL, // fallback resource list
+@@ -235,7 +231,7 @@ boolean Application::initializeWindowSys
+ return TRUE;
+ }
+
+-void Application::parseCommand(unsigned int* argcp, char** argv,
++void Application::parseCommand(int* argcp, char** argv,
+ XrmOptionDescList optlist, int optlistsize)
+ {
+ char res_file[256];
+@@ -280,7 +276,7 @@ void Application::parseCommand(unsigned
+ //
+ }
+
+-boolean Application::initialize(unsigned int* argcp, char** argv)
++boolean Application::initialize(int* argcp, char** argv)
+ {
+ //
+ // Initialize the window system if not done already.
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_base_Application.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_base_Application.h Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_uipp_base_Application.h,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/base/Application.h.orig 2005-11-09 18:26:29.000000000 +0000
++++ src/uipp/base/Application.h
+@@ -49,8 +49,7 @@ class Application : public UIComponent,
+ //
+ // The main program needs to access protected member functions.
+ //
+- friend int main(unsigned int argc,
+- char** argv);
++ friend int main(int argc, char**argv);
+
+
+ //
+@@ -71,9 +70,9 @@ class Application : public UIComponent,
+ //
+ // Initialize the window system.
+ //
+- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++ virtual boolean initializeWindowSystem(int *argcp, char **argv);
+
+- virtual void parseCommand(unsigned int* argcp, char** argv,
++ virtual void parseCommand(int* argcp, char** argv,
+ XrmOptionDescList optlist, int optlistsize);
+
+ //
+@@ -145,7 +144,7 @@ class Application : public UIComponent,
+ // Initializes any Application specfic state. This routine should
+ // be called by main() or subclasses only.
+ //
+- virtual boolean initialize(unsigned int* argcp, char** argv);
++ virtual boolean initialize(int* argcp, char** argv);
+
+ //
+ // Allow others to access our event processing mechanism
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_base_IBMApplication.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_base_IBMApplication.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_uipp_base_IBMApplication.C,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/base/IBMApplication.C.orig 2012-04-16 23:33:21.000000000 +0000
++++ src/uipp/base/IBMApplication.C
+@@ -349,7 +349,7 @@ int status;
+ }
+
+
+-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
+ {
+
+ if (!this->Application::initializeWindowSystem(argcp, argv))
+@@ -375,8 +375,7 @@ boolean IBMApplication::initializeWindow
+ return TRUE;
+ }
+
+-boolean IBMApplication::initialize(unsigned int* argcp,
+- char** argv)
++boolean IBMApplication::initialize(int* argcp, char** argv)
+ {
+ if (!this->Application::initialize(argcp,argv))
+ return FALSE;
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_base_IBMApplication.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_base_IBMApplication.h Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_uipp_base_IBMApplication.h,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/base/IBMApplication.h.orig 2012-04-16 23:33:18.000000000 +0000
++++ src/uipp/base/IBMApplication.h
+@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
+ //
+ // Initialize the window system.
+ //
+- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++ virtual boolean initializeWindowSystem(int *argcp, char **argv);
+
+ //
+ // Protected member data:
+@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
+
+ HelpWin *helpWindow;
+
+- boolean initialize(unsigned int* argcp, char** argv);
++ boolean initialize(int* argcp, char** argv);
+
+ //
+ // Load application specific action routines
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_dxui_Main.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_dxui_Main.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_dxui_Main.C,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/dxui/Main.C.orig 2005-12-07 17:50:53.000000000 +0000
++++ src/uipp/dxui/Main.C
+@@ -48,8 +48,7 @@ extern unsigned long _etext;
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+
+-int main(unsigned int argc,
+- char** argv)
++int main(int argc, char **argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+ // The following is not needed with the recent Exceed XDK. If you're
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_dxuilib_DXApplication.C,v 1.1 2012/04/17 17:44:02 joerg Exp $
+
+--- src/uipp/dxuilib/DXApplication.C.orig 2006-06-22 19:45:34.000000000 +0000
++++ src/uipp/dxuilib/DXApplication.C
+@@ -2248,8 +2248,7 @@ void DXApplication::installDefaultResour
+ this->setDefaultResources(baseWidget, _defaultDXResources);
+ this->IBMApplication::installDefaultResources(baseWidget);
+ }
+-boolean DXApplication::initialize(unsigned int* argcp,
+- char** argv)
++boolean DXApplication::initialize(int* argcp, char** argv)
+ {
+ boolean wasSetBusy = FALSE;
+
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_dxuilib_DXApplication.h Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_dxuilib_DXApplication.h,v 1.1 2012/04/17 17:44:03 joerg Exp $
+
+--- src/uipp/dxuilib/DXApplication.h.orig 2006-05-08 16:20:10.000000000 +0000
++++ src/uipp/dxuilib/DXApplication.h
+@@ -372,8 +372,7 @@ class DXApplication : public IBMApplicat
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
+- char** argv);
++ virtual boolean initialize(int* argcp, char** argv);
+
+ //
+ // Override of superclass handleEvents() function:
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_mb_MBApplication.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_mb_MBApplication.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_mb_MBApplication.C,v 1.1 2012/04/17 17:44:03 joerg Exp $
+
+--- src/uipp/mb/MBApplication.C.orig 2006-05-08 16:20:13.000000000 +0000
++++ src/uipp/mb/MBApplication.C
+@@ -117,8 +117,7 @@ InitializeSignals(void)
+ #endif
+ }
+
+-boolean MBApplication::initialize(unsigned int* argcp,
+- char** argv)
++boolean MBApplication::initialize(int* argcp, char** argv)
+ {
+ ASSERT(argcp);
+ ASSERT(argv);
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_mb_MBApplication.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_mb_MBApplication.h Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_mb_MBApplication.h,v 1.1 2012/04/17 17:44:03 joerg Exp $
+
+--- src/uipp/mb/MBApplication.h.orig 1999-05-10 15:46:25.000000000 +0000
++++ src/uipp/mb/MBApplication.h
+@@ -51,8 +51,7 @@ class MBApplication : public IBMApplicat
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
+- char** argv);
++ virtual boolean initialize(int* argcp, char** argv);
+
+ static MBResource resource;
+
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_mb_Main.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_mb_Main.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_mb_Main.C,v 1.1 2012/04/17 17:44:03 joerg Exp $
+
+--- src/uipp/mb/Main.C.orig 2000-05-20 17:49:40.000000000 +0000
++++ src/uipp/mb/Main.C
+@@ -22,8 +22,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+
+-int main(unsigned int argc,
+- char** argv)
++int main(int argc, char **argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+ HCLXmInit();
diff -r fb561d89b800 -r 9d37ff81f54a graphics/dx/patches/patch-src_uipp_prompter_GARApplication.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dx/patches/patch-src_uipp_prompter_GARApplication.C Tue Apr 17 17:44:02 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_uipp_prompter_GARApplication.C,v 1.1 2012/04/17 17:44:03 joerg Exp $
+
+--- src/uipp/prompter/GARApplication.C.orig 2006-05-08 16:20:13.000000000 +0000
++++ src/uipp/prompter/GARApplication.C
Home |
Main Index |
Thread Index |
Old Index