diff options
Diffstat (limited to 'devel')
54 files changed, 1114 insertions, 1130 deletions
diff --git a/devel/charva/Makefile b/devel/charva/Makefile index 9ae6926f8d40..b16566b689cc 100644 --- a/devel/charva/Makefile +++ b/devel/charva/Makefile @@ -17,22 +17,17 @@ RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging OPTIONS_DEFINE= DOCS USES= dos2unix zip -DOS2UNIX_FILES= c/src/Makefile.freebsd.txt +DOS2UNIX_GLOB= build.xml Makefile.freebsd.txt *.c *.java USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= clean makeDLL dist -PLIST_SUB= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///} -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ - %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libTerminal.so +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ + ${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so PORTDOCS= * -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif +DOCS_ALL_TARGET= javadoc do-install: @${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..." @@ -44,12 +39,12 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/c/lib/libTerminal.so \ ${STAGEDIR}${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so @${ECHO_MSG} " [DONE]" -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${ECHO_MSG} -n ">> Installing documentation..." @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/docs && ${FIND} * \ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 @${ECHO_MSG} " [DONE]" -.endif .include <bsd.port.mk> diff --git a/devel/charva/files/patch-build.xml b/devel/charva/files/patch-build.xml index 34009684f83d..886a38e73476 100644 --- a/devel/charva/files/patch-build.xml +++ b/devel/charva/files/patch-build.xml @@ -1,26 +1,26 @@ ---- build.xml.orig Sun Sep 10 22:10:16 2006 -+++ build.xml Tue Dec 12 08:37:44 2006 +--- build.xml.orig 2016-06-20 12:40:44 UTC ++++ build.xml @@ -90,6 +90,7 @@ - <property name="src.home" value="${basedir}/java/src"/>
- <property name="test.home" value="${basedir}/test"/>
- <property name="c.home" value="${basedir}/c"/>
-+ <property name="os.type" value="freebsd"/>
-
-
- <!-- ==================== Compilation Control Options ==================== -->
+ <property name="src.home" value="${basedir}/java/src"/> + <property name="test.home" value="${basedir}/test"/> + <property name="c.home" value="${basedir}/c"/> ++ <property name="os.type" value="freebsd"/> + + + <!-- ==================== Compilation Control Options ==================== --> @@ -189,14 +190,8 @@ - description="Compile the JNI shared library">
-
- <mkdir dir="${c.home}/lib"/>
-- <input
-- message="Enter the operating system type: "
-- validargs="aix,beos,freebsd,gcj,hpux,linux,mac_osx,solaris,win32"
-- addproperty="os.type"
-- />
--
- <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo>
-- <exec executable="make"
-+ <exec executable="gmake"
- dir="${c.home}/src"
- output="${c.home}/lib/make.out.txt"
- failonerror="true">
+ description="Compile the JNI shared library"> + + <mkdir dir="${c.home}/lib"/> +- <input +- message="Enter the operating system type: " +- validargs="aix,beos,freebsd,gcj,hpux,linux,mac_osx,solaris,win32" +- addproperty="os.type" +- /> +- + <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo> +- <exec executable="make" ++ <exec executable="gmake" + dir="${c.home}/src" + output="${c.home}/lib/make.out.txt" + failonerror="true"> diff --git a/devel/charva/files/patch-c_src_Makefile.freebsd.txt b/devel/charva/files/patch-c_src_Makefile.freebsd.txt index f5cff1b2b976..1bc1311d69b1 100644 --- a/devel/charva/files/patch-c_src_Makefile.freebsd.txt +++ b/devel/charva/files/patch-c_src_Makefile.freebsd.txt @@ -1,6 +1,6 @@ ---- ./c/src/Makefile.freebsd.txt.orig 2013-10-30 08:21:28.829906040 +0000 -+++ ./c/src/Makefile.freebsd.txt 2013-10-30 08:21:37.384905061 +0000 -@@ -6,7 +6,6 @@ +--- c/src/Makefile.freebsd.txt.orig 2016-06-20 12:40:44 UTC ++++ c/src/Makefile.freebsd.txt +@@ -6,7 +6,6 @@ OS = freebsd SHARED_OBJECT_EXT = so TARGET = libTerminal.${SHARED_OBJECT_EXT} diff --git a/devel/charva/files/patch-c_src_Toolkit.c b/devel/charva/files/patch-c_src_Toolkit.c index ab2c57c977ed..1a1fb852ae23 100644 --- a/devel/charva/files/patch-c_src_Toolkit.c +++ b/devel/charva/files/patch-c_src_Toolkit.c @@ -1,18 +1,18 @@ ---- c/src/Toolkit.c.orig Wed Dec 13 12:29:03 2006 -+++ c/src/Toolkit.c Wed Dec 13 12:35:30 2006 -@@ -372,6 +372,7 @@ - if (colors_started)
- attr = COLOR_PAIR(colorpair_);
-
-+ attron(attr);
- // If the top of the box is outside the clipping rectangle, don't bother
- // to draw the top.
- if (top_ >= top && top_ <= bottom) {
-@@ -414,6 +415,7 @@ - my_addch_with_clip(ACS_VLINE); // right vertical line
- }
- }
-+ attroff(attr);
- }
-
- JNIEXPORT void JNICALL Java_charva_awt_Toolkit_blankBoxNative
+--- c/src/Toolkit.c.orig 2016-06-20 12:40:44 UTC ++++ c/src/Toolkit.c +@@ -372,6 +372,7 @@ JNIEXPORT void JNICALL Java_charva_awt_T + if (colors_started) + attr = COLOR_PAIR(colorpair_); + ++ attron(attr); + // If the top of the box is outside the clipping rectangle, don't bother + // to draw the top. + if (top_ >= top && top_ <= bottom) { +@@ -414,6 +415,7 @@ JNIEXPORT void JNICALL Java_charva_awt_T + my_addch_with_clip(ACS_VLINE); // right vertical line + } + } ++ attroff(attr); + } + + JNIEXPORT void JNICALL Java_charva_awt_Toolkit_blankBoxNative diff --git a/devel/charva/files/patch-java_src_charva_awt_CardLayout.java b/devel/charva/files/patch-java_src_charva_awt_CardLayout.java index f6099f09c572..107a3a8ad140 100644 --- a/devel/charva/files/patch-java_src_charva_awt_CardLayout.java +++ b/devel/charva/files/patch-java_src_charva_awt_CardLayout.java @@ -1,5 +1,5 @@ ---- java/src/charva/awt/CardLayout.java.orig Mon Jan 29 09:39:30 2007 -+++ java/src/charva/awt/CardLayout.java Mon Jan 29 09:39:30 2007 +--- java/src/charva/awt/CardLayout.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/CardLayout.java @@ -0,0 +1,115 @@ +package charva.awt; + diff --git a/devel/charva/files/patch-java_src_charva_awt_Component.java b/devel/charva/files/patch-java_src_charva_awt_Component.java index 241cc078e49c..9e28008e993a 100644 --- a/devel/charva/files/patch-java_src_charva_awt_Component.java +++ b/devel/charva/files/patch-java_src_charva_awt_Component.java @@ -1,29 +1,29 @@ ---- java/src/charva/awt/Component.java.orig Mon Aug 14 18:03:14 2006 -+++ java/src/charva/awt/Component.java Mon Jan 29 09:39:30 2007 -@@ -118,6 +118,17 @@ public abstract class Component {
- }
-
- /**
-+ * Determines whether this component will be displayed on the screen
-+ * if it's displayable.
-+ * @return <code>true</code> if the component and all of its ancestors
-+ * are visible, <code>false</code> otherwise
-+ */
-+ public boolean isRecursivelyVisible() {
-+ Container parent = getParent();
-+ return _visible && (parent == null || parent.isRecursivelyVisible());
-+ }
-+
-+ /**
- * To be implemented by concrete subclasses.
- */
- public abstract void draw();
-@@ -449,7 +460,7 @@ public abstract class Component {
- * traversal.
- */
- public boolean isFocusTraversable() {
-- return (_enabled && _visible);
-+ return (_enabled && isRecursivelyVisible());
- }
-
- /**
+--- java/src/charva/awt/Component.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/Component.java +@@ -118,6 +118,17 @@ public abstract class Component { + } + + /** ++ * Determines whether this component will be displayed on the screen ++ * if it's displayable. ++ * @return <code>true</code> if the component and all of its ancestors ++ * are visible, <code>false</code> otherwise ++ */ ++ public boolean isRecursivelyVisible() { ++ Container parent = getParent(); ++ return _visible && (parent == null || parent.isRecursivelyVisible()); ++ } ++ ++ /** + * To be implemented by concrete subclasses. + */ + public abstract void draw(); +@@ -449,7 +460,7 @@ public abstract class Component { + * traversal. + */ + public boolean isFocusTraversable() { +- return (_enabled && _visible); ++ return (_enabled && isRecursivelyVisible()); + } + + /** diff --git a/devel/charva/files/patch-java_src_charva_awt_Container.java b/devel/charva/files/patch-java_src_charva_awt_Container.java index 1c3f2d525c58..ebec529e5fe0 100644 --- a/devel/charva/files/patch-java_src_charva_awt_Container.java +++ b/devel/charva/files/patch-java_src_charva_awt_Container.java @@ -1,100 +1,100 @@ ---- java/src/charva/awt/Container.java.orig Mon Aug 7 12:07:52 2006 -+++ java/src/charva/awt/Container.java Mon Jan 29 09:39:30 2007 -@@ -89,6 +89,23 @@ public abstract class Container
- invalidate();
- }
-
-+ public void setBounds(int top_, int left_, int bottom_, int right_) {
-+ super.setBounds(top_, left_, bottom_, right_);
-+ setSize(right_ - left_ + 1, bottom_ - top_ + 1);
-+ }
-+
-+ public void setBounds(Point topleft_, Dimension size_) {
-+ super.setBounds(topleft_, size_);
-+ setSize(size_);
-+ }
-+
-+ public void setBounds(Rectangle bounds) {
-+ super.setBounds(bounds);
-+ setSize(
-+ bounds.getRight() - bounds.getLeft() + 1,
-+ bounds.getBottom() - bounds.getTop() + 1);
-+ }
-+
- public Dimension minimumSize() {
- if (_layoutMgr == null)
- return _size;
-@@ -105,13 +122,30 @@ public abstract class Container
- return (Component) _components.elementAt(n);
- }
-
-+ protected Component getComponentAt(int x, int y, boolean checkVisibility) {
-+ Enumeration e = _components.elements();
-+ while (e.hasMoreElements()) {
-+ Component c = (Component) e.nextElement();
-+ if ((!checkVisibility || c.isVisible()) && c.contains(x, y)) {
-+ if (c instanceof Container) {
-+ // Calculate the coordinates of the point relative
-+ // to the origin of the container
-+ Point origin = c.getLocation();
-+ return ((Container) c).getComponentAt(x - origin.x, y - origin.y, checkVisibility);
-+ } else
-+ return c;
-+ }
-+ }
-+ return null;
-+ }
-+
- /**
- * Returns the component that contains the specified point, or null
- * if no component contains the point. The x and y coordinates of
- * the point are relative to the origin of this container.
- */
- public Component getComponentAt(Point p) {
-- return getComponentAt(p.x, p.y);
-+ return getComponentAt(p.x, p.y, false);
- }
-
- /**
-@@ -120,20 +154,27 @@ public abstract class Container
- * the point are relative to the origin of this container.
- */
- public Component getComponentAt(int x, int y) {
-- Enumeration e = _components.elements();
-- while (e.hasMoreElements()) {
-- Component c = (Component) e.nextElement();
-- if (c.contains(x, y)) {
-- if (c instanceof Container) {
-- // Calculate the coordinates of the point relative
-- // to the origin of the container
-- Point origin = c.getLocation();
-- return ((Container) c).getComponentAt(x - origin.x, y - origin.y);
-- } else
-- return c;
-- }
-- }
-- return null;
-+ return getComponentAt(x, y, false);
-+ }
-+
-+ /**
-+ * Returns the visible component that contains the specified point,
-+ * or null if no visible component contains the point. The x and y
-+ * coordinates of the point are relative to the origin of this container.
-+ */
-+ public final Component findComponentAt(Point p) {
-+ return findComponentAt(p.x, p.y);
-+ }
-+
-+ /**
-+ * Returns the visible component that contains the specified point,
-+ * or null if no visible component contains the point. The x and y
-+ * coordinates of the point are relative to the origin of this container.
-+ */
-+ public final Component findComponentAt(int x, int y) {
-+ if (!isRecursivelyVisible())
-+ return null;
-+ return(getComponentAt(x, y, true));
- }
-
- /**
+--- java/src/charva/awt/Container.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/Container.java +@@ -89,6 +89,23 @@ public abstract class Container + invalidate(); + } + ++ public void setBounds(int top_, int left_, int bottom_, int right_) { ++ super.setBounds(top_, left_, bottom_, right_); ++ setSize(right_ - left_ + 1, bottom_ - top_ + 1); ++ } ++ ++ public void setBounds(Point topleft_, Dimension size_) { ++ super.setBounds(topleft_, size_); ++ setSize(size_); ++ } ++ ++ public void setBounds(Rectangle bounds) { ++ super.setBounds(bounds); ++ setSize( ++ bounds.getRight() - bounds.getLeft() + 1, ++ bounds.getBottom() - bounds.getTop() + 1); ++ } ++ + public Dimension minimumSize() { + if (_layoutMgr == null) + return _size; +@@ -105,13 +122,30 @@ public abstract class Container + return (Component) _components.elementAt(n); + } + ++ protected Component getComponentAt(int x, int y, boolean checkVisibility) { ++ Enumeration e = _components.elements(); ++ while (e.hasMoreElements()) { ++ Component c = (Component) e.nextElement(); ++ if ((!checkVisibility || c.isVisible()) && c.contains(x, y)) { ++ if (c instanceof Container) { ++ // Calculate the coordinates of the point relative ++ // to the origin of the container ++ Point origin = c.getLocation(); ++ return ((Container) c).getComponentAt(x - origin.x, y - origin.y, checkVisibility); ++ } else ++ return c; ++ } ++ } ++ return null; ++ } ++ + /** + * Returns the component that contains the specified point, or null + * if no component contains the point. The x and y coordinates of + * the point are relative to the origin of this container. + */ + public Component getComponentAt(Point p) { +- return getComponentAt(p.x, p.y); ++ return getComponentAt(p.x, p.y, false); + } + + /** +@@ -120,20 +154,27 @@ public abstract class Container + * the point are relative to the origin of this container. + */ + public Component getComponentAt(int x, int y) { +- Enumeration e = _components.elements(); +- while (e.hasMoreElements()) { +- Component c = (Component) e.nextElement(); +- if (c.contains(x, y)) { +- if (c instanceof Container) { +- // Calculate the coordinates of the point relative +- // to the origin of the container +- Point origin = c.getLocation(); +- return ((Container) c).getComponentAt(x - origin.x, y - origin.y); +- } else +- return c; +- } +- } +- return null; ++ return getComponentAt(x, y, false); ++ } ++ ++ /** ++ * Returns the visible component that contains the specified point, ++ * or null if no visible component contains the point. The x and y ++ * coordinates of the point are relative to the origin of this container. ++ */ ++ public final Component findComponentAt(Point p) { ++ return findComponentAt(p.x, p.y); ++ } ++ ++ /** ++ * Returns the visible component that contains the specified point, ++ * or null if no visible component contains the point. The x and y ++ * coordinates of the point are relative to the origin of this container. ++ */ ++ public final Component findComponentAt(int x, int y) { ++ if (!isRecursivelyVisible()) ++ return null; ++ return(getComponentAt(x, y, true)); + } + + /** diff --git a/devel/charva/files/patch-java_src_charva_awt_Toolkit.java b/devel/charva/files/patch-java_src_charva_awt_Toolkit.java index 99317c20df36..31e2304d6417 100644 --- a/devel/charva/files/patch-java_src_charva_awt_Toolkit.java +++ b/devel/charva/files/patch-java_src_charva_awt_Toolkit.java @@ -1,113 +1,113 @@ ---- java/src/charva/awt/Toolkit.java.orig Mon Aug 14 20:59:42 2006 -+++ java/src/charva/awt/Toolkit.java Mon Jan 29 09:39:30 2007 -@@ -157,13 +157,9 @@ public class Toolkit {
- * key as defined in the "VK_*" values.
- */
- public void fireKeystroke(int key_, Component source_) {
-- int id;
-- if (Toolkit.isActionKey(key_))
-- id = AWTEvent.KEY_TYPED;
-- else
-- id = AWTEvent.KEY_PRESSED;
--
-- _evtQueue.postEvent(new KeyEvent(key_, id, source_));
-+ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_PRESSED, source_));
-+ if (!Toolkit.isActionKey(key_))
-+ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_TYPED, source_));
- }
-
- public FocusEvent getLastFocusEvent() {
-@@ -225,7 +221,7 @@ public class Toolkit {
- _lastMousePressTime = System.currentTimeMillis();
-
- Component component =
-- top_window.getComponentAt(x - origin.x, y - origin.y);
-+ top_window.findComponentAt(x - origin.x, y - origin.y);
-
- if (component != null) {
- _evtQueue.postEvent(new MouseEvent(component, modifiers, x, y, 0, button));
-@@ -796,43 +792,47 @@ public class Toolkit {
- //public boolean isActionKey() { return (_key >= 256); }
- public static boolean isActionKey( int _key )
- {
-- boolean value = false;
-- if ( _key == charva.awt.event.KeyEvent.VK_ESCAPE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_DOWN ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_UP ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_LEFT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_RIGHT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_HOME ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_BACK_SPACE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F1 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F2 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F3 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F4 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F5 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F6 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F7 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F8 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F9 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F10 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F11 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F12 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F13 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F14 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F15 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F16 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F17 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F18 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F19 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F20 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_DELETE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_INSERT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_DOWN ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_UP ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_ENTER ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_BACK_TAB ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_END ) value=true;
--
-- return (value);
-+ switch (_key) {
-+ case charva.awt.event.KeyEvent.VK_ESCAPE:
-+ case charva.awt.event.KeyEvent.VK_DOWN:
-+ case charva.awt.event.KeyEvent.VK_UP:
-+ case charva.awt.event.KeyEvent.VK_LEFT:
-+ case charva.awt.event.KeyEvent.VK_RIGHT:
-+ case charva.awt.event.KeyEvent.VK_HOME:
-+ case charva.awt.event.KeyEvent.VK_BACK_SPACE:
-+ case charva.awt.event.KeyEvent.VK_F1:
-+ case charva.awt.event.KeyEvent.VK_F2:
-+ case charva.awt.event.KeyEvent.VK_F3:
-+ case charva.awt.event.KeyEvent.VK_F4:
-+ case charva.awt.event.KeyEvent.VK_F5:
-+ case charva.awt.event.KeyEvent.VK_F6:
-+ case charva.awt.event.KeyEvent.VK_F7:
-+ case charva.awt.event.KeyEvent.VK_F8:
-+ case charva.awt.event.KeyEvent.VK_F9:
-+ case charva.awt.event.KeyEvent.VK_F10:
-+ case charva.awt.event.KeyEvent.VK_F11:
-+ case charva.awt.event.KeyEvent.VK_F12:
-+ case charva.awt.event.KeyEvent.VK_F13:
-+ case charva.awt.event.KeyEvent.VK_F14:
-+ case charva.awt.event.KeyEvent.VK_F15:
-+ case charva.awt.event.KeyEvent.VK_F16:
-+ case charva.awt.event.KeyEvent.VK_F17:
-+ case charva.awt.event.KeyEvent.VK_F18:
-+ case charva.awt.event.KeyEvent.VK_F19:
-+ case charva.awt.event.KeyEvent.VK_F20:
-+ case charva.awt.event.KeyEvent.VK_DELETE:
-+ case charva.awt.event.KeyEvent.VK_INSERT:
-+ case charva.awt.event.KeyEvent.VK_PAGE_DOWN:
-+ case charva.awt.event.KeyEvent.VK_PAGE_UP:
-+ case charva.awt.event.KeyEvent.VK_ENTER:
-+ case charva.awt.event.KeyEvent.VK_BACK_TAB:
-+ case charva.awt.event.KeyEvent.VK_END:
-+ return true;
-+ default:
-+ if ( _key < 32 )
-+ return true;
-+ return false;
-+ }
- }
-
- //====================================================================
+--- java/src/charva/awt/Toolkit.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/Toolkit.java +@@ -157,13 +157,9 @@ public class Toolkit { + * key as defined in the "VK_*" values. + */ + public void fireKeystroke(int key_, Component source_) { +- int id; +- if (Toolkit.isActionKey(key_)) +- id = AWTEvent.KEY_TYPED; +- else +- id = AWTEvent.KEY_PRESSED; +- +- _evtQueue.postEvent(new KeyEvent(key_, id, source_)); ++ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_PRESSED, source_)); ++ if (!Toolkit.isActionKey(key_)) ++ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_TYPED, source_)); + } + + public FocusEvent getLastFocusEvent() { +@@ -225,7 +221,7 @@ public class Toolkit { + _lastMousePressTime = System.currentTimeMillis(); + + Component component = +- top_window.getComponentAt(x - origin.x, y - origin.y); ++ top_window.findComponentAt(x - origin.x, y - origin.y); + + if (component != null) { + _evtQueue.postEvent(new MouseEvent(component, modifiers, x, y, 0, button)); +@@ -796,43 +792,47 @@ public class Toolkit { + //public boolean isActionKey() { return (_key >= 256); } + public static boolean isActionKey( int _key ) + { +- boolean value = false; +- if ( _key == charva.awt.event.KeyEvent.VK_ESCAPE ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_DOWN ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_UP ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_LEFT ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_RIGHT ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_HOME ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_BACK_SPACE ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F1 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F2 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F3 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F4 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F5 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F6 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F7 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F8 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F9 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F10 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F11 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F12 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F13 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F14 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F15 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F16 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F17 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F18 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F19 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_F20 ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_DELETE ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_INSERT ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_DOWN ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_UP ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_ENTER ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_BACK_TAB ) value=true; +- if ( _key == charva.awt.event.KeyEvent.VK_END ) value=true; +- +- return (value); ++ switch (_key) { ++ case charva.awt.event.KeyEvent.VK_ESCAPE: ++ case charva.awt.event.KeyEvent.VK_DOWN: ++ case charva.awt.event.KeyEvent.VK_UP: ++ case charva.awt.event.KeyEvent.VK_LEFT: ++ case charva.awt.event.KeyEvent.VK_RIGHT: ++ case charva.awt.event.KeyEvent.VK_HOME: ++ case charva.awt.event.KeyEvent.VK_BACK_SPACE: ++ case charva.awt.event.KeyEvent.VK_F1: ++ case charva.awt.event.KeyEvent.VK_F2: ++ case charva.awt.event.KeyEvent.VK_F3: ++ case charva.awt.event.KeyEvent.VK_F4: ++ case charva.awt.event.KeyEvent.VK_F5: ++ case charva.awt.event.KeyEvent.VK_F6: ++ case charva.awt.event.KeyEvent.VK_F7: ++ case charva.awt.event.KeyEvent.VK_F8: ++ case charva.awt.event.KeyEvent.VK_F9: ++ case charva.awt.event.KeyEvent.VK_F10: ++ case charva.awt.event.KeyEvent.VK_F11: ++ case charva.awt.event.KeyEvent.VK_F12: ++ case charva.awt.event.KeyEvent.VK_F13: ++ case charva.awt.event.KeyEvent.VK_F14: ++ case charva.awt.event.KeyEvent.VK_F15: ++ case charva.awt.event.KeyEvent.VK_F16: ++ case charva.awt.event.KeyEvent.VK_F17: ++ case charva.awt.event.KeyEvent.VK_F18: ++ case charva.awt.event.KeyEvent.VK_F19: ++ case charva.awt.event.KeyEvent.VK_F20: ++ case charva.awt.event.KeyEvent.VK_DELETE: ++ case charva.awt.event.KeyEvent.VK_INSERT: ++ case charva.awt.event.KeyEvent.VK_PAGE_DOWN: ++ case charva.awt.event.KeyEvent.VK_PAGE_UP: ++ case charva.awt.event.KeyEvent.VK_ENTER: ++ case charva.awt.event.KeyEvent.VK_BACK_TAB: ++ case charva.awt.event.KeyEvent.VK_END: ++ return true; ++ default: ++ if ( _key < 32 ) ++ return true; ++ return false; ++ } + } + + //==================================================================== diff --git a/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java b/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java index 46dddb40df27..d6c6559ce44f 100644 --- a/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java +++ b/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java @@ -1,232 +1,232 @@ ---- java/src/charva/awt/VerticalFlowLayout.java.orig Mon Jan 29 09:39:30 2007 -+++ java/src/charva/awt/VerticalFlowLayout.java Mon Jan 29 09:39:30 2007 +--- java/src/charva/awt/VerticalFlowLayout.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/VerticalFlowLayout.java @@ -0,0 +1,229 @@ -+/* class FlowLayout
-+ *
-+ * Copyright (C) 2001 R M Pitman
-+ * Copyright (C) 2007 Lapo Luchini
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+package charva.awt;
-+
-+import java.util.Enumeration;
-+import java.util.Vector;
-+
-+/**
-+ * A concrete implementation of LayoutManager that lays out its
-+ * components top-to-bottom.
-+ */
-+public class VerticalFlowLayout
-+ implements LayoutManager {
-+ /**
-+ * Default constructor. Sets alignment to MIDDLE, hgap to 1,
-+ * and vgap to 0.
-+ */
-+ public VerticalFlowLayout() {
-+ this(MIDDLE, 1, 0);
-+ }
-+
-+ /**
-+ * Use this constructor when you want to set the alignment and the
-+ * horizontal and vertical gaps.
-+ */
-+ public VerticalFlowLayout(int align_, int hgap_, int vgap_) {
-+ _align = align_;
-+ _hgap = hgap_;
-+ _vgap = vgap_;
-+ }
-+
-+ /**
-+ * Sets the alignment for this layout. Allowable values are
-+ * VerticalFlowLayout.TOP, VerticalFlowLayout.MIDDLE and
-+ * VerticalFlowLayout.BOTTOM.
-+ */
-+ public void setAlignment(int align_) {
-+ _align = align_;
-+ }
-+
-+ /**
-+ * Gets the alignment for this layout.
-+ */
-+ public int getAlignment() {
-+ return _align;
-+ }
-+
-+ /**
-+ * Calculate the minimum-size rectangle that can enclose all the
-+ * components in the given container.
-+ */
-+ public Dimension minimumSize(Container container_) {
-+
-+ int width = 0;
-+ int height = 0;
-+
-+ Component[] components = container_.getComponents();
-+ for (int i = 0; i < components.length; i++) {
-+ Dimension d = components[i].minimumSize();
-+
-+ /* Make allowance for the gap between this component and the
-+ * previous component.
-+ */
-+ if (i != 0)
-+ height += _vgap;
-+
-+ height += d.height;
-+ if (d.width > width)
-+ width = d.width;
-+ }
-+
-+ /* Take into account the border frame (if any).
-+ */
-+ Insets insets = container_.getInsets();
-+ height += insets.top + insets.bottom;
-+ width += insets.left + insets.right;
-+
-+ return new Dimension(width, height);
-+ }
-+
-+ /**
-+ * Lay out the components according to the specified alignment, hgap
-+ * and vgap.
-+ * This is called when the size of the container has already been
-+ * calculated.
-+ * It lays out the components in a column, one at a time, until it
-+ * determines that there is not enough space left in the column.
-+ * Then it moves to the next row. If there is not enough horizontal
-+ * space in the container to lay out all of the components, it
-+ * removes the remaining components from the container; they don't
-+ * appear at all.
-+ */
-+ public void doLayout(Container container_) {
-+
-+ Insets insets = container_.getInsets();
-+ int availableHeight = container_.getSize().height -
-+ insets.top - insets.bottom;
-+ int heightLeft = availableHeight;
-+ int widthLeft = container_.getSize().width -
-+ insets.left - insets.right;
-+
-+ int hoffset = insets.left;
-+
-+ Component[] components = container_.getComponents();
-+ Vector localvector = new Vector();
-+ for (int i = 0; i < components.length; i++) {
-+ Component c = components[i];
-+
-+ /* Get the contained container to lay itself out at its
-+ * preferred size, if it is not already laid out.
-+ */
-+ if (c instanceof Container) {
-+ Container cont = (Container) c;
-+ if (cont.isValid() == false) {
-+ cont.setSize(cont.minimumSize());
-+ cont.doLayout();
-+ }
-+ }
-+
-+ /* Determine the width required to lay out the current
-+ * component (including the gap between this component and
-+ * the previous component).
-+ */
-+ int requiredHeight = c.getSize().height;
-+ if (i != 0)
-+ requiredHeight += _vgap;
-+
-+ if (requiredHeight > heightLeft) {
-+ int columnWidth = 0;
-+ if (localvector.size() != 0) {
-+ columnWidth = layoutColumn(container_, localvector,
-+ widthLeft, heightLeft, hoffset);
-+ localvector.removeAllElements();
-+ }
-+ hoffset += columnWidth + _hgap;
-+ heightLeft = availableHeight;
-+ widthLeft -= columnWidth + _hgap;
-+ }
-+ heightLeft -= requiredHeight;
-+
-+ // Build up a temporary list of components for this row.
-+ localvector.add(c);
-+ }
-+ layoutColumn(container_, localvector, widthLeft, heightLeft, hoffset);
-+
-+ }
-+
-+ /**
-+ * private function to layout a single column of components.
-+ *
-+ * @return The height of the laid-out column.
-+ */
-+ private int layoutColumn(Container container_, Vector components_,
-+ int widthleft_, int heightleft_, int hoffset_) {
-+
-+ int voffset = 0;
-+ int columnWidth = 0;
-+ Insets insets = container_.getInsets();
-+
-+ switch (_align) {
-+ case TOP:
-+ voffset = insets.top;
-+ break;
-+ case MIDDLE:
-+ voffset = insets.top + heightleft_ / 2;
-+ break;
-+ case BOTTOM:
-+ voffset = insets.top + heightleft_;
-+ break;
-+ }
-+
-+ Enumeration e = components_.elements();
-+ while (e.hasMoreElements()) {
-+ Component c = (Component) e.nextElement();
-+ if (c.getSize().width > columnWidth)
-+ columnWidth = c.getSize().width;
-+
-+ if (columnWidth > widthleft_) {
-+ container_.remove(c); // we have run out of space
-+ continue;
-+ }
-+
-+ c.setLocation(hoffset_, voffset);
-+ voffset += c.getSize().height + _vgap;
-+ }
-+ return columnWidth;
-+ }
-+
-+ //====================================================================
-+ // INSTANCE VARIABLES
-+
-+ /**
-+ * Alignment of components (TOP, BOTTOM or MIDDLE)
-+ */
-+ private int _align = MIDDLE;
-+
-+ /**
-+ * Horizontal gap between components
-+ */
-+ private int _hgap = 1;
-+
-+ /**
-+ * Vertical gap between components
-+ */
-+ private int _vgap = 0;
-+
-+ public static final int TOP = 1;
-+ public static final int MIDDLE = 2;
-+ public static final int BOTTOM = 3;
-+
-+}
++/* class FlowLayout ++ * ++ * Copyright (C) 2001 R M Pitman ++ * Copyright (C) 2007 Lapo Luchini ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++package charva.awt; ++ ++import java.util.Enumeration; ++import java.util.Vector; ++ ++/** ++ * A concrete implementation of LayoutManager that lays out its ++ * components top-to-bottom. ++ */ ++public class VerticalFlowLayout ++ implements LayoutManager { ++ /** ++ * Default constructor. Sets alignment to MIDDLE, hgap to 1, ++ * and vgap to 0. ++ */ ++ public VerticalFlowLayout() { ++ this(MIDDLE, 1, 0); ++ } ++ ++ /** ++ * Use this constructor when you want to set the alignment and the ++ * horizontal and vertical gaps. ++ */ ++ public VerticalFlowLayout(int align_, int hgap_, int vgap_) { ++ _align = align_; ++ _hgap = hgap_; ++ _vgap = vgap_; ++ } ++ ++ /** ++ * Sets the alignment for this layout. Allowable values are ++ * VerticalFlowLayout.TOP, VerticalFlowLayout.MIDDLE and ++ * VerticalFlowLayout.BOTTOM. ++ */ ++ public void setAlignment(int align_) { ++ _align = align_; ++ } ++ ++ /** ++ * Gets the alignment for this layout. ++ */ ++ public int getAlignment() { ++ return _align; ++ } ++ ++ /** ++ * Calculate the minimum-size rectangle that can enclose all the ++ * components in the given container. ++ */ ++ public Dimension minimumSize(Container container_) { ++ ++ int width = 0; ++ int height = 0; ++ ++ Component[] components = container_.getComponents(); ++ for (int i = 0; i < components.length; i++) { ++ Dimension d = components[i].minimumSize(); ++ ++ /* Make allowance for the gap between this component and the ++ * previous component. ++ */ ++ if (i != 0) ++ height += _vgap; ++ ++ height += d.height; ++ if (d.width > width) ++ width = d.width; ++ } ++ ++ /* Take into account the border frame (if any). ++ */ ++ Insets insets = container_.getInsets(); ++ height += insets.top + insets.bottom; ++ width += insets.left + insets.right; ++ ++ return new Dimension(width, height); ++ } ++ ++ /** ++ * Lay out the components according to the specified alignment, hgap ++ * and vgap. ++ * This is called when the size of the container has already been ++ * calculated. ++ * It lays out the components in a column, one at a time, until it ++ * determines that there is not enough space left in the column. ++ * Then it moves to the next row. If there is not enough horizontal ++ * space in the container to lay out all of the components, it ++ * removes the remaining components from the container; they don't ++ * appear at all. ++ */ ++ public void doLayout(Container container_) { ++ ++ Insets insets = container_.getInsets(); ++ int availableHeight = container_.getSize().height - ++ insets.top - insets.bottom; ++ int heightLeft = availableHeight; ++ int widthLeft = container_.getSize().width - ++ insets.left - insets.right; ++ ++ int hoffset = insets.left; ++ ++ Component[] components = container_.getComponents(); ++ Vector localvector = new Vector(); ++ for (int i = 0; i < components.length; i++) { ++ Component c = components[i]; ++ ++ /* Get the contained container to lay itself out at its ++ * preferred size, if it is not already laid out. ++ */ ++ if (c instanceof Container) { ++ Container cont = (Container) c; ++ if (cont.isValid() == false) { ++ cont.setSize(cont.minimumSize()); ++ cont.doLayout(); ++ } ++ } ++ ++ /* Determine the width required to lay out the current ++ * component (including the gap between this component and ++ * the previous component). ++ */ ++ int requiredHeight = c.getSize().height; ++ if (i != 0) ++ requiredHeight += _vgap; ++ ++ if (requiredHeight > heightLeft) { ++ int columnWidth = 0; ++ if (localvector.size() != 0) { ++ columnWidth = layoutColumn(container_, localvector, ++ widthLeft, heightLeft, hoffset); ++ localvector.removeAllElements(); ++ } ++ hoffset += columnWidth + _hgap; ++ heightLeft = availableHeight; ++ widthLeft -= columnWidth + _hgap; ++ } ++ heightLeft -= requiredHeight; ++ ++ // Build up a temporary list of components for this row. ++ localvector.add(c); ++ } ++ layoutColumn(container_, localvector, widthLeft, heightLeft, hoffset); ++ ++ } ++ ++ /** ++ * private function to layout a single column of components. ++ * ++ * @return The height of the laid-out column. ++ */ ++ private int layoutColumn(Container container_, Vector components_, ++ int widthleft_, int heightleft_, int hoffset_) { ++ ++ int voffset = 0; ++ int columnWidth = 0; ++ Insets insets = container_.getInsets(); ++ ++ switch (_align) { ++ case TOP: ++ voffset = insets.top; ++ break; ++ case MIDDLE: ++ voffset = insets.top + heightleft_ / 2; ++ break; ++ case BOTTOM: ++ voffset = insets.top + heightleft_; ++ break; ++ } ++ ++ Enumeration e = components_.elements(); ++ while (e.hasMoreElements()) { ++ Component c = (Component) e.nextElement(); ++ if (c.getSize().width > columnWidth) ++ columnWidth = c.getSize().width; ++ ++ if (columnWidth > widthleft_) { ++ container_.remove(c); // we have run out of space ++ continue; ++ } ++ ++ c.setLocation(hoffset_, voffset); ++ voffset += c.getSize().height + _vgap; ++ } ++ return columnWidth; ++ } ++ ++ //==================================================================== ++ // INSTANCE VARIABLES ++ ++ /** ++ * Alignment of components (TOP, BOTTOM or MIDDLE) ++ */ ++ private int _align = MIDDLE; ++ ++ /** ++ * Horizontal gap between components ++ */ ++ private int _hgap = 1; ++ ++ /** ++ * Vertical gap between components ++ */ ++ private int _vgap = 0; ++ ++ public static final int TOP = 1; ++ public static final int MIDDLE = 2; ++ public static final int BOTTOM = 3; ++ ++} diff --git a/devel/charva/files/patch-java_src_charva_awt_Window.java b/devel/charva/files/patch-java_src_charva_awt_Window.java index 41f18aa85c09..84178c37cda2 100644 --- a/devel/charva/files/patch-java_src_charva_awt_Window.java +++ b/devel/charva/files/patch-java_src_charva_awt_Window.java @@ -1,56 +1,56 @@ ---- java/src/charva/awt/Window.java.orig Mon Aug 14 17:38:56 2006 -+++ java/src/charva/awt/Window.java Mon Jan 29 09:39:30 2007 -@@ -156,13 +156,21 @@ public class Window
- */
- SyncQueue.getInstance().postEvent(new SyncEvent(this));
-
-- if (_dispatchThreadRunning)
-- run();
-- else {
-- _dispatchThreadRunning = true;
-- Thread dispatchThread = new Thread(this);
-- dispatchThread.setName("event dispatcher");
-- dispatchThread.start();
-+ if (_dispatchThread != null) {
-+ if (Thread.currentThread() == _dispatchThread) {
-+ // we are in the EDT, we must manage events
-+ run();
-+ } else {
-+ // we are not the EDT, let's wait for him to ask us to close
-+ synchronized (this) {
-+ while (!_windowClosed)
-+ try { wait(); } catch (InterruptedException e) { }
-+ }
-+ }
-+ } else {
-+ _dispatchThread = new Thread(this);
-+ _dispatchThread.setName("event dispatcher");
-+ _dispatchThread.start();
-
- /* If "charva.script.playback" is defined, we start up
- * a thread for playing back the script. Keys from both the
-@@ -270,7 +278,10 @@ public class Window
- */
- if (we.getID() == AWTEvent.WINDOW_CLOSING) {
-
-- we.getWindow()._windowClosed = true;
-+ synchronized (we.getWindow()) {
-+ we.getWindow()._windowClosed = true;
-+ we.getWindow().notify();
-+ }
-
- /* Remove this window from the list of those displayed,
- * and blank out the screen area where the window was
-@@ -407,10 +418,10 @@ public class Window
-
- private Window _owner;
- protected Toolkit _term;
-- private boolean _windowClosed = false;
-+ private volatile boolean _windowClosed = false;
-
- private Vector _windowListeners = null;
-
-- private static boolean _dispatchThreadRunning = false;
-+ private static Thread _dispatchThread = null;
-
- }
+--- java/src/charva/awt/Window.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/Window.java +@@ -156,13 +156,21 @@ public class Window + */ + SyncQueue.getInstance().postEvent(new SyncEvent(this)); + +- if (_dispatchThreadRunning) +- run(); +- else { +- _dispatchThreadRunning = true; +- Thread dispatchThread = new Thread(this); +- dispatchThread.setName("event dispatcher"); +- dispatchThread.start(); ++ if (_dispatchThread != null) { ++ if (Thread.currentThread() == _dispatchThread) { ++ // we are in the EDT, we must manage events ++ run(); ++ } else { ++ // we are not the EDT, let's wait for him to ask us to close ++ synchronized (this) { ++ while (!_windowClosed) ++ try { wait(); } catch (InterruptedException e) { } ++ } ++ } ++ } else { ++ _dispatchThread = new Thread(this); ++ _dispatchThread.setName("event dispatcher"); ++ _dispatchThread.start(); + + /* If "charva.script.playback" is defined, we start up + * a thread for playing back the script. Keys from both the +@@ -270,7 +278,10 @@ public class Window + */ + if (we.getID() == AWTEvent.WINDOW_CLOSING) { + +- we.getWindow()._windowClosed = true; ++ synchronized (we.getWindow()) { ++ we.getWindow()._windowClosed = true; ++ we.getWindow().notify(); ++ } + + /* Remove this window from the list of those displayed, + * and blank out the screen area where the window was +@@ -407,10 +418,10 @@ public class Window + + private Window _owner; + protected Toolkit _term; +- private boolean _windowClosed = false; ++ private volatile boolean _windowClosed = false; + + private Vector _windowListeners = null; + +- private static boolean _dispatchThreadRunning = false; ++ private static Thread _dispatchThread = null; + + } diff --git a/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java b/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java index 5635c2e6bd8e..8369831a9ac6 100644 --- a/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java +++ b/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java @@ -1,5 +1,5 @@ ---- java/src/charva/awt/event/FocusAdapter.java.orig Mon Jan 29 09:39:30 2007 -+++ java/src/charva/awt/event/FocusAdapter.java Mon Jan 29 09:39:30 2007 +--- java/src/charva/awt/event/FocusAdapter.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charva/awt/event/FocusAdapter.java @@ -0,0 +1,17 @@ +package charva.awt.event; + diff --git a/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java b/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java index ecc8db0bdb9b..434d96c49e83 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java +++ b/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java @@ -1,90 +1,90 @@ ---- java/src/charvax/swing/AbstractButton.java.orig Sat Dec 17 15:27:30 2005 -+++ java/src/charvax/swing/AbstractButton.java Mon Jan 29 09:39:30 2007 +--- java/src/charvax/swing/AbstractButton.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/AbstractButton.java @@ -19,15 +19,16 @@ -
- package charvax.swing;
-
-+import java.util.Enumeration;
-+import java.util.Vector;
-+
-+import charva.awt.Container;
- import charva.awt.EventQueue;
- import charva.awt.ItemSelectable;
- import charva.awt.Toolkit;
- import charva.awt.Window;
- import charva.awt.event.*;
-
--import java.util.Enumeration;
--import java.util.Vector;
--
- /**
- * This forms the base class for components that exhibit button-like
- * behavior.
-@@ -50,6 +51,12 @@ public abstract class AbstractButton
- _label = label_;
- }
-
-+ protected void addKeyListenerToAncestor() {
-+ Window ancestor = super.getAncestorWindow();
-+ if (ancestor != null)
-+ ancestor.addKeyListener(this);
-+ }
-+
- /**
- * Set the button's mnemonic character.
- * The mnemonic is the key which will activate this button if focus
-@@ -76,10 +83,16 @@ public abstract class AbstractButton
- */
- public void setMnemonic(int mnemonic_) {
- _mnemonic = mnemonic_;
-- Window ancestor = super.getAncestorWindow();
-- if (ancestor != null) {
-- ancestor.addKeyListener(this);
-- }
-+ addKeyListenerToAncestor();
-+ }
-+
-+ public void setParent(Container container_) {
-+ if ((_mnemonic != 0) && (_parent != null) && (_parent.get() != null))
-+ throw new RuntimeException("Removal from previous parent currently not implemented");
-+ //removeKeyListenerFromAncestor();
-+ super.setParent(container_);
-+ if (_mnemonic != 0)
-+ addKeyListenerToAncestor();
- }
-
- /**
-@@ -237,24 +250,23 @@ public abstract class AbstractButton
- * character or a function key or cursor key was typed.
- */
- public void keyPressed(KeyEvent ke_) {
-- if (ke_.getKeyCode() == getMnemonic()) {
-+ int code = ke_.getKeyCode();
-+ int mnem = getMnemonic();
-+ if (!ke_.isActionKey()) {
-+ code = Character.toLowerCase(code);
-+ mnem = Character.toLowerCase(mnem);
-+ }
-+ if (code == mnem) {
- doClick();
- ke_.consume();
- }
- }
-
- /**
-- * Implements the KeyListener interface; this is called if a printable
-- * (ASCII or ISO8859-1) character was typed.
-+ * Implements the KeyListener interface; this is called only if a
-+ * printable (ASCII or ISO8859-1) character was typed.
- */
- public void keyTyped(KeyEvent ke_) {
-- // We must accept either uppercase or lowercase mnemonic characters.
-- char keyLower = Character.toLowerCase((char) ke_.getKeyChar());
-- char mnemonicLower = Character.toLowerCase((char) getMnemonic());
-- if (keyLower == mnemonicLower) {
-- doClick();
-- ke_.consume();
-- }
- }
-
- /**
+ + package charvax.swing; + ++import java.util.Enumeration; ++import java.util.Vector; ++ ++import charva.awt.Container; + import charva.awt.EventQueue; + import charva.awt.ItemSelectable; + import charva.awt.Toolkit; + import charva.awt.Window; + import charva.awt.event.*; + +-import java.util.Enumeration; +-import java.util.Vector; +- + /** + * This forms the base class for components that exhibit button-like + * behavior. +@@ -50,6 +51,12 @@ public abstract class AbstractButton + _label = label_; + } + ++ protected void addKeyListenerToAncestor() { ++ Window ancestor = super.getAncestorWindow(); ++ if (ancestor != null) ++ ancestor.addKeyListener(this); ++ } ++ + /** + * Set the button's mnemonic character. + * The mnemonic is the key which will activate this button if focus +@@ -76,10 +83,16 @@ public abstract class AbstractButton + */ + public void setMnemonic(int mnemonic_) { + _mnemonic = mnemonic_; +- Window ancestor = super.getAncestorWindow(); +- if (ancestor != null) { +- ancestor.addKeyListener(this); +- } ++ addKeyListenerToAncestor(); ++ } ++ ++ public void setParent(Container container_) { ++ if ((_mnemonic != 0) && (_parent != null) && (_parent.get() != null)) ++ throw new RuntimeException("Removal from previous parent currently not implemented"); ++ //removeKeyListenerFromAncestor(); ++ super.setParent(container_); ++ if (_mnemonic != 0) ++ addKeyListenerToAncestor(); + } + + /** +@@ -237,24 +250,23 @@ public abstract class AbstractButton + * character or a function key or cursor key was typed. + */ + public void keyPressed(KeyEvent ke_) { +- if (ke_.getKeyCode() == getMnemonic()) { ++ int code = ke_.getKeyCode(); ++ int mnem = getMnemonic(); ++ if (!ke_.isActionKey()) { ++ code = Character.toLowerCase(code); ++ mnem = Character.toLowerCase(mnem); ++ } ++ if (code == mnem) { + doClick(); + ke_.consume(); + } + } + + /** +- * Implements the KeyListener interface; this is called if a printable +- * (ASCII or ISO8859-1) character was typed. ++ * Implements the KeyListener interface; this is called only if a ++ * printable (ASCII or ISO8859-1) character was typed. + */ + public void keyTyped(KeyEvent ke_) { +- // We must accept either uppercase or lowercase mnemonic characters. +- char keyLower = Character.toLowerCase((char) ke_.getKeyChar()); +- char mnemonicLower = Character.toLowerCase((char) getMnemonic()); +- if (keyLower == mnemonicLower) { +- doClick(); +- ke_.consume(); +- } + } + + /** diff --git a/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java b/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java index a64a92dd2f20..b1dbcc7a39be 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java +++ b/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java @@ -1,26 +1,26 @@ ---- java/src/charvax/swing/ButtonGroup.java.orig 2005-12-17 15:27:30.000000000 +0100 -+++ java/src/charvax/swing/ButtonGroup.java 2009-11-16 10:26:42.000000000 +0100 -@@ -63,9 +63,10 @@ - * Adds the specified button to the group.
- */
- public void add(AbstractButton button_) {
-+ if (getSelection() != null)
-+ button_.setSelected(false);
- _buttons.add(button_);
- button_.addItemListener(this);
-- button_.setSelected(false);
- }
-
- /**
-@@ -133,10 +134,9 @@ - for (Enumeration e = _buttons.elements(); e.hasMoreElements();) {
-
- AbstractButton b = (AbstractButton) e.nextElement();
-- if (source != b || statechange != ItemEvent.SELECTED) {
-+ if (source != b && statechange == ItemEvent.SELECTED) {
- if (b.isSelected()) {
- b._selected = false;
-- b.setEnabled(true);
- }
- }
- }
+--- java/src/charvax/swing/ButtonGroup.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/ButtonGroup.java +@@ -63,9 +63,10 @@ public class ButtonGroup + * Adds the specified button to the group. + */ + public void add(AbstractButton button_) { ++ if (getSelection() != null) ++ button_.setSelected(false); + _buttons.add(button_); + button_.addItemListener(this); +- button_.setSelected(false); + } + + /** +@@ -133,10 +134,9 @@ public class ButtonGroup + for (Enumeration e = _buttons.elements(); e.hasMoreElements();) { + + AbstractButton b = (AbstractButton) e.nextElement(); +- if (source != b || statechange != ItemEvent.SELECTED) { ++ if (source != b && statechange == ItemEvent.SELECTED) { + if (b.isSelected()) { + b._selected = false; +- b.setEnabled(true); + } + } + } diff --git a/devel/charva/files/patch-java_src_charvax_swing_JLabel.java b/devel/charva/files/patch-java_src_charvax_swing_JLabel.java index 8abd344b235a..65704b0143c5 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_JLabel.java +++ b/devel/charva/files/patch-java_src_charvax_swing_JLabel.java @@ -1,47 +1,47 @@ ---- java/src/charvax/swing/JLabel.java.orig Sat Dec 17 15:27:30 2005 -+++ java/src/charvax/swing/JLabel.java Mon Jan 29 09:39:30 2007 +--- java/src/charvax/swing/JLabel.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/JLabel.java @@ -20,6 +20,7 @@ - package charvax.swing;
-
- import charva.awt.Dimension;
-+import charva.awt.Font;
- import charva.awt.Insets;
- import charva.awt.Point;
- import charva.awt.Toolkit;
-@@ -79,6 +80,10 @@ public class JLabel
- // Draw the border if it exists
- super.draw();
-
-+ int attrib = 0;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-+
- /* Get the absolute origin of this component.
- */
- Point origin = getLocationOnScreen();
-@@ -98,7 +103,7 @@ public class JLabel
- buf.setLength(_width); // truncate
-
- int colorpair = getCursesColor();
-- term.addString(buf.toString(), 0, colorpair);
-+ term.addString(buf.toString(), attrib, colorpair);
- }
-
- /**
-@@ -169,10 +174,16 @@ public class JLabel
- return "JLabel: [" + getText() + "]";
- }
-
-+ public void setFont(Font font_) {
-+ _bold = ((font_.getStyle() & Font.BOLD) != 0);
-+ }
-+
- //====================================================================
- // INSTANCE VARIABLES
-
- private String _labeltext;
- private int _width;
-+
-+ protected boolean _bold = false;
-
- }
+ package charvax.swing; + + import charva.awt.Dimension; ++import charva.awt.Font; + import charva.awt.Insets; + import charva.awt.Point; + import charva.awt.Toolkit; +@@ -79,6 +80,10 @@ public class JLabel + // Draw the border if it exists + super.draw(); + ++ int attrib = 0; ++ if (_bold) ++ attrib |= Toolkit.A_BOLD; ++ + /* Get the absolute origin of this component. + */ + Point origin = getLocationOnScreen(); +@@ -98,7 +103,7 @@ public class JLabel + buf.setLength(_width); // truncate + + int colorpair = getCursesColor(); +- term.addString(buf.toString(), 0, colorpair); ++ term.addString(buf.toString(), attrib, colorpair); + } + + /** +@@ -169,10 +174,16 @@ public class JLabel + return "JLabel: [" + getText() + "]"; + } + ++ public void setFont(Font font_) { ++ _bold = ((font_.getStyle() & Font.BOLD) != 0); ++ } ++ + //==================================================================== + // INSTANCE VARIABLES + + private String _labeltext; + private int _width; + ++ protected boolean _bold = false; ++ + } diff --git a/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java b/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java index 5da15a49530f..67a52ec20271 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java +++ b/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java @@ -1,14 +1,14 @@ ---- java/src/charvax/swing/JPasswordField.java.orig Sat Dec 17 15:27:30 2005 -+++ java/src/charvax/swing/JPasswordField.java Mon Jan 29 09:39:30 2007 -@@ -133,8 +133,10 @@ public class JPasswordField
- * UNDERLINE attribute.
- */
- int attrib = 0;
-- if (super._enabled)
-+ if (_enabled)
- attrib |= Toolkit.A_UNDERLINE;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-
- term.setCursor(origin);
- term.addString(_padding, attrib, colorpair);
+--- java/src/charvax/swing/JPasswordField.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/JPasswordField.java +@@ -133,8 +133,10 @@ public class JPasswordField + * UNDERLINE attribute. + */ + int attrib = 0; +- if (super._enabled) ++ if (_enabled) + attrib |= Toolkit.A_UNDERLINE; ++ if (_bold) ++ attrib |= Toolkit.A_BOLD; + + term.setCursor(origin); + term.addString(_padding, attrib, colorpair); diff --git a/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java b/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java index e81f770de064..cfff4704fae8 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java +++ b/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java @@ -1,40 +1,40 @@ ---- java/src/charvax/swing/JTextArea.java.orig Fri Dec 30 16:14:22 2005 -+++ java/src/charvax/swing/JTextArea.java Mon Jan 29 09:39:30 2007 -@@ -412,6 +412,10 @@ public class JTextArea
- Point tempCaret = null;
- Point caret = _caret;
-
-+ int attrib = 0;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-+
- /* Get the absolute origin of this component.
- */
- Point origin = getLocationOnScreen();
-@@ -458,7 +462,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- } else {
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- col++;
- }
- } else { // We have reached the right-hand column.
-@@ -470,7 +474,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- } else {
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- col++;
- _columns++;
- }
-@@ -482,7 +486,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- if (chr != '\n') // thanks to Chris Rogers for this
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- } else {
- /* We must back-track until we get to whitespace, so
- * that we can move the word to the next line.
+--- java/src/charvax/swing/JTextArea.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/JTextArea.java +@@ -412,6 +412,10 @@ public class JTextArea + Point tempCaret = null; + Point caret = _caret; + ++ int attrib = 0; ++ if (_bold) ++ attrib |= Toolkit.A_BOLD; ++ + /* Get the absolute origin of this component. + */ + Point origin = getLocationOnScreen(); +@@ -458,7 +462,7 @@ public class JTextArea + _rows++; + term.setCursor(origin.addOffset(col, row)); + } else { +- term.addChar(chr, 0, colorpair); ++ term.addChar(chr, attrib, colorpair); + col++; + } + } else { // We have reached the right-hand column. +@@ -470,7 +474,7 @@ public class JTextArea + _rows++; + term.setCursor(origin.addOffset(col, row)); + } else { +- term.addChar(chr, 0, colorpair); ++ term.addChar(chr, attrib, colorpair); + col++; + _columns++; + } +@@ -482,7 +486,7 @@ public class JTextArea + _rows++; + term.setCursor(origin.addOffset(col, row)); + if (chr != '\n') // thanks to Chris Rogers for this +- term.addChar(chr, 0, colorpair); ++ term.addChar(chr, attrib, colorpair); + } else { + /* We must back-track until we get to whitespace, so + * that we can move the word to the next line. diff --git a/devel/charva/files/patch-java_src_charvax_swing_JTextField.java b/devel/charva/files/patch-java_src_charvax_swing_JTextField.java index f6878151f29f..1b1c9f41f770 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_JTextField.java +++ b/devel/charva/files/patch-java_src_charvax_swing_JTextField.java @@ -1,43 +1,43 @@ ---- java/src/charvax/swing/JTextField.java.orig Fri Dec 30 16:15:12 2005 -+++ java/src/charvax/swing/JTextField.java Mon Jan 29 09:39:30 2007 -@@ -118,11 +118,6 @@ public class JTextField
- return _columns;
- }
-
-- public void setFont(Font font_) {
-- _bold = ((font_.getStyle() & Font.BOLD) != 0);
-- }
--
--
- /**
- * Set the action command
- */
-@@ -189,9 +184,8 @@ public class JTextField
- * UNDERLINE attribute.
- */
- int attrib = 0;
-- if (super._enabled)
-+ if (_enabled)
- attrib |= Toolkit.A_UNDERLINE;
--
- if (_bold)
- attrib |= Toolkit.A_BOLD;
-
-@@ -247,7 +241,7 @@ public class JTextField
-
- /*
- */
-- if (ke_.isActionKey() == false) {
-+ if (!ke_.isActionKey() && (ke_.getID() == KeyEvent.KEY_TYPED)) {
-
- /* If it is a control character, ignore it.
- * @todo Do something more useful with control chars.
-@@ -414,8 +408,6 @@ public class JTextField
-
- //====================================================================
- // INSTANCE VARIABLES
--
-- protected boolean _bold = false;
-
- protected int _columns;
-
+--- java/src/charvax/swing/JTextField.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/JTextField.java +@@ -118,11 +118,6 @@ public class JTextField + return _columns; + } + +- public void setFont(Font font_) { +- _bold = ((font_.getStyle() & Font.BOLD) != 0); +- } +- +- + /** + * Set the action command + */ +@@ -189,9 +184,8 @@ public class JTextField + * UNDERLINE attribute. + */ + int attrib = 0; +- if (super._enabled) ++ if (_enabled) + attrib |= Toolkit.A_UNDERLINE; +- + if (_bold) + attrib |= Toolkit.A_BOLD; + +@@ -247,7 +241,7 @@ public class JTextField + + /* + */ +- if (ke_.isActionKey() == false) { ++ if (!ke_.isActionKey() && (ke_.getID() == KeyEvent.KEY_TYPED)) { + + /* If it is a control character, ignore it. + * @todo Do something more useful with control chars. +@@ -415,8 +409,6 @@ public class JTextField + //==================================================================== + // INSTANCE VARIABLES + +- protected boolean _bold = false; +- + protected int _columns; + + /** diff --git a/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java b/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java index eadcdd1b2681..c4ad44fc56aa 100644 --- a/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java +++ b/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java @@ -1,28 +1,28 @@ ---- java/src/charvax/swing/text/JTextComponent.java.orig Sat Dec 17 15:27:30 2005 -+++ java/src/charvax/swing/text/JTextComponent.java Mon Jan 29 09:39:30 2007 +--- java/src/charvax/swing/text/JTextComponent.java.orig 2016-06-20 12:40:44 UTC ++++ java/src/charvax/swing/text/JTextComponent.java @@ -19,6 +19,7 @@ -
- package charvax.swing.text;
-
-+import charva.awt.Font;
- import charvax.swing.JComponent;
-
- /**
-@@ -72,6 +73,10 @@ public abstract class JTextComponent
- _editable = editable_;
- }
-
-+ public void setFont(Font font_) {
-+ _bold = ((font_.getStyle() & Font.BOLD) != 0);
-+ }
-+
- //====================================================================
- // INSTANCE VARIABLES
-
-@@ -84,4 +89,6 @@ public abstract class JTextComponent
- protected StringBuffer _document;
-
- protected boolean _editable = true;
-+
-+ protected boolean _bold = false;
- }
+ + package charvax.swing.text; + ++import charva.awt.Font; + import charvax.swing.JComponent; + + /** +@@ -72,6 +73,10 @@ public abstract class JTextComponent + _editable = editable_; + } + ++ public void setFont(Font font_) { ++ _bold = ((font_.getStyle() & Font.BOLD) != 0); ++ } ++ + //==================================================================== + // INSTANCE VARIABLES + +@@ -84,4 +89,6 @@ public abstract class JTextComponent + protected StringBuffer _document; + + protected boolean _editable = true; ++ ++ protected boolean _bold = false; + } diff --git a/devel/flickrnet/Makefile b/devel/flickrnet/Makefile index 038906df56b4..f1a5f8c6ab09 100644 --- a/devel/flickrnet/Makefile +++ b/devel/flickrnet/Makefile @@ -11,7 +11,8 @@ DISTNAME= FlickrNet${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}-Src-48055 MAINTAINER= ports@FreeBSD.org COMMENT= Flickr .Net API Library -USES= mono zip +USES= dos2unix mono zip +DOS2UNIX_GLOB= *.cs WRKSRC= ${WRKDIR}/FlickrNet do-build: diff --git a/devel/flickrnet/files/patch-AssemblyInfo.cs b/devel/flickrnet/files/patch-AssemblyInfo.cs index 539b0e08e8d8..d01cf9044a40 100644 --- a/devel/flickrnet/files/patch-AssemblyInfo.cs +++ b/devel/flickrnet/files/patch-AssemblyInfo.cs @@ -1,16 +1,11 @@ ---- AssemblyInfo.cs.orig +--- AssemblyInfo.cs.orig 2016-06-20 14:46:51 UTC +++ AssemblyInfo.cs -@@ -61,10 +61,10 @@ - [assembly: AssemblyKeyName("")]
-
- #if !WindowsCE
--[assembly: AssemblyKeyFile("..\\..\\FlickrNet.snk")]
-+[assembly: AssemblyKeyFile("FlickrNet.snk")]
- [assembly: AllowPartiallyTrustedCallers()]
- [assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
- #endif
-
- [assembly: CLSCompliantAttribute(true)]
--[assembly: ComVisible(false)] -\ No newline at end of file -+[assembly: ComVisible(false)]
+@@ -61,7 +61,7 @@ using System.Runtime.InteropServices; + [assembly: AssemblyKeyName("")] + + #if !WindowsCE +-[assembly: AssemblyKeyFile("..\\..\\FlickrNet.snk")] ++[assembly: AssemblyKeyFile("FlickrNet.snk")] + [assembly: AllowPartiallyTrustedCallers()] + [assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] + #endif diff --git a/devel/flickrnet/files/patch-flickrnet.pc.in b/devel/flickrnet/files/patch-flickrnet.pc.in index 231a427dde4c..e080169ef67d 100644 --- a/devel/flickrnet/files/patch-flickrnet.pc.in +++ b/devel/flickrnet/files/patch-flickrnet.pc.in @@ -1,4 +1,4 @@ ---- /dev/null +--- flickrnet.pc.in.orig 2016-06-20 14:46:51 UTC +++ flickrnet.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ diff --git a/devel/itext/Makefile b/devel/itext/Makefile index f1a1ef62eb5b..e2d06ca375be 100644 --- a/devel/itext/Makefile +++ b/devel/itext/Makefile @@ -23,7 +23,8 @@ RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:java/bouncycastle \ OPTIONS_DEFINE= DOCS -USES= tar:bzip2 +USES= dos2unix tar:bzip2 +DOS2UNIX_GLOB= *.java USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes diff --git a/devel/itext/files/patch-ant_.ant.properties b/devel/itext/files/patch-ant_.ant.properties index 485a242a2fd7..b4a724d540e9 100644 --- a/devel/itext/files/patch-ant_.ant.properties +++ b/devel/itext/files/patch-ant_.ant.properties @@ -1,6 +1,6 @@ ---- ant/.ant.properties.orig 2010-01-12 10:03:11.000000000 +0100 -+++ ant/.ant.properties 2010-01-12 10:05:47.000000000 +0100 -@@ -3,7 +3,7 @@ +--- ant/.ant.properties.orig 2009-11-27 12:59:39 UTC ++++ ant/.ant.properties +@@ -3,7 +3,7 @@ releasedate=2009-11-27 itext.home=../.. diff --git a/devel/itext/files/patch-ant_compile.xml b/devel/itext/files/patch-ant_compile.xml index a2e382df3e07..66c2e586c740 100644 --- a/devel/itext/files/patch-ant_compile.xml +++ b/devel/itext/files/patch-ant_compile.xml @@ -1,5 +1,5 @@ ---- ant/compile.xml.orig 2009-06-08 02:50:15.000000000 +0200 -+++ ant/compile.xml 2011-11-24 20:55:01.000000000 +0100 +--- ant/compile.xml.orig 2009-06-08 00:50:15 UTC ++++ ant/compile.xml @@ -92,11 +92,17 @@ <include name="**/*.html"/> </fileset> diff --git a/devel/itext/files/patch-ant_site.xml b/devel/itext/files/patch-ant_site.xml index 74941b60a43c..feaa67895591 100644 --- a/devel/itext/files/patch-ant_site.xml +++ b/devel/itext/files/patch-ant_site.xml @@ -1,5 +1,5 @@ ---- ant/site.xml.orig 2014-06-05 07:50:18.377016755 +0000 -+++ ant/site.xml 2014-06-05 07:49:27.026098152 +0000 +--- ant/site.xml.orig 2009-06-08 00:50:15 UTC ++++ ant/site.xml @@ -65,7 +65,7 @@ <javadoc destdir="${itext.docs}" diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java index b9d3044f4773..15ae507fe6ae 100644 --- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java +++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java @@ -1,6 +1,6 @@ ---- core/com/lowagie/text/pdf/PRTokeniser.java.orig 2012-07-03 16:02:24.000000000 +0200 -+++ core/com/lowagie/text/pdf/PRTokeniser.java 2012-07-03 16:03:30.000000000 +0200 -@@ -281,6 +281,12 @@ +--- core/com/lowagie/text/pdf/PRTokeniser.java.orig 2016-06-20 15:02:42 UTC ++++ core/com/lowagie/text/pdf/PRTokeniser.java +@@ -281,6 +281,12 @@ public class PRTokeniser { } } } diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java index 270aa60a4876..3ea8d60aaabe 100644 --- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java +++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java @@ -1,6 +1,6 @@ ---- core/com/lowagie/text/pdf/PdfReader.java.orig 2012-01-27 11:27:08.000000000 +0100 -+++ core/com/lowagie/text/pdf/PdfReader.java 2012-01-27 11:27:41.000000000 +0100 -@@ -1464,7 +1464,7 @@ +--- core/com/lowagie/text/pdf/PdfReader.java.orig 2016-06-20 15:02:42 UTC ++++ core/com/lowagie/text/pdf/PdfReader.java +@@ -1464,7 +1464,7 @@ public class PdfReader implements PdfVie } } thisStream *= 2; diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java index 611d5122a57b..4a831740f244 100644 --- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java +++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java @@ -1,6 +1,6 @@ ---- core/com/lowagie/text/pdf/PdfStamperImp.java.orig 2009-11-16 13:48:42.000000000 +0100 -+++ core/com/lowagie/text/pdf/PdfStamperImp.java 2012-07-12 10:27:01.000000000 +0200 -@@ -208,8 +208,17 @@ +--- core/com/lowagie/text/pdf/PdfStamperImp.java.orig 2016-06-20 15:02:42 UTC ++++ core/com/lowagie/text/pdf/PdfStamperImp.java +@@ -208,8 +208,17 @@ class PdfStamperImp extends PdfWriter { } // metadata int skipInfo = -1; diff --git a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java index f4fee55a92de..865385e5d65e 100644 --- a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java +++ b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java @@ -1,23 +1,23 @@ ---- core/com/lowagie/text/xml/xmp/XmpReader.java.orig 2011-11-24 16:34:23.000000000 +0100 -+++ core/com/lowagie/text/xml/xmp/XmpReader.java 2011-11-24 16:41:54.000000000 +0100 -@@ -103,8 +103,19 @@ - public boolean replace(String namespaceURI, String localName, String value) {
- NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
- Node node;
-- if (nodes.getLength() == 0)
-+ if (nodes.getLength() == 0) {
-+ nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description");
-+ if (nodes.getLength() == 0) return false;
-+ for (int i = 0; i < nodes.getLength(); i++) {
-+ node = nodes.item(i);
-+ Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName);
-+ if (attribute != null) {
-+ attribute.setNodeValue(value);
-+ return true;
-+ }
-+ }
- return false;
-+ }
- for (int i = 0; i < nodes.getLength(); i++) {
- node = nodes.item(i);
- setNodeText(domDocument, node, value);
+--- core/com/lowagie/text/xml/xmp/XmpReader.java.orig 2016-06-20 15:02:42 UTC ++++ core/com/lowagie/text/xml/xmp/XmpReader.java +@@ -103,8 +103,19 @@ public class XmpReader { + public boolean replace(String namespaceURI, String localName, String value) { + NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName); + Node node; +- if (nodes.getLength() == 0) ++ if (nodes.getLength() == 0) { ++ nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description"); ++ if (nodes.getLength() == 0) return false; ++ for (int i = 0; i < nodes.getLength(); i++) { ++ node = nodes.item(i); ++ Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName); ++ if (attribute != null) { ++ attribute.setNodeValue(value); ++ return true; ++ } ++ } + return false; ++ } + for (int i = 0; i < nodes.getLength(); i++) { + node = nodes.item(i); + setNodeText(domDocument, node, value); diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile index 060d04cb2cca..a3dccb7dc9ad 100644 --- a/devel/p5-Geo-ShapeFile/Makefile +++ b/devel/p5-Geo-ShapeFile/Makefile @@ -18,7 +18,8 @@ BUILD_DEPENDS= p5-Tree-R>0:devel/p5-Tree-R \ RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes -USES= perl5 +USES= dos2unix perl5 +DOS2UNIX_GLOB= *.pm *.pl *.t USE_PERL5= configure .include <bsd.port.mk> diff --git a/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t b/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t index cc100bfbb574..5e6b323e972e 100644 --- a/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t +++ b/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t @@ -1,14 +1,14 @@ ---- t/main_tests.t.orig 2015-10-16 16:34:06.906634577 +0200 -+++ t/main_tests.t 2015-10-16 16:34:56.598631573 +0200 +--- t/main_tests.t.orig 2016-06-20 14:43:13 UTC ++++ t/main_tests.t @@ -3,7 +3,10 @@ - use Test::More;
- use strict;
- use warnings;
--use rlib '../lib', './lib';
-+#use rlib '../lib', './lib';
-+use FindBin;
-+use lib "$FindBin::Bin/lib";
-+use lib "$FindBin::Bin/../lib";
-
- use Geo::ShapeFile;
- use Geo::ShapeFile::Shape;
+ use Test::More; + use strict; + use warnings; +-use rlib '../lib', './lib'; ++#use rlib '../lib', './lib'; ++use FindBin; ++use lib "$FindBin::Bin/lib"; ++use lib "$FindBin::Bin/../lib"; + + use Geo::ShapeFile; + use Geo::ShapeFile::Shape; diff --git a/devel/p5-Sys-Cpu/Makefile b/devel/p5-Sys-Cpu/Makefile index f792414859f3..60c666bf001e 100644 --- a/devel/p5-Sys-Cpu/Makefile +++ b/devel/p5-Sys-Cpu/Makefile @@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= terry@sucked-in.com COMMENT= Sys::CPU - Perl extension for getting CPU information -USES= perl5 +USES= dos2unix perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/devel/p5-Sys-Cpu/files/patch-CPU.xs b/devel/p5-Sys-Cpu/files/patch-CPU.xs index ba4ae3ca5fdb..839bdb22303f 100644 --- a/devel/p5-Sys-Cpu/files/patch-CPU.xs +++ b/devel/p5-Sys-Cpu/files/patch-CPU.xs @@ -1,36 +1,36 @@ ---- CPU.xs.orig 2010-09-03 23:30:18.000000000 +0100 -+++ CPU.xs 2010-09-03 23:57:31.000000000 +0100 -@@ -40,6 +40,11 @@
- #define _have_cpu_clock
- #define _have_cpu_type
- #endif
-+#ifdef __FreeBSD__
-+ #include <sys/sysctl.h>
-+ #define _have_cpu_type
-+ #define _have_cpu_clock
-+#endif
- #ifdef WINDOWS
- /* Registry Functions */
-
-@@ -317,6 +322,10 @@
- int value = proc_cpuinfo_clock();
- if (value) clock = value;
- #endif
-+#ifdef __FreeBSD__
-+ size_t len = sizeof(clock);
-+ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0);
-+#endif
- #ifdef WINDOWS
- char *clock_str = malloc(MAX_IDENT_SIZE);
- /*!! untested !!*/
-@@ -356,6 +365,10 @@
- {
- char *value = malloc(MAX_IDENT_SIZE);
- int retcode = 0;
-+#ifdef __FreeBSD__
-+ size_t len = MAX_IDENT_SIZE;
-+ sysctlbyname("hw.model", value, &len, NULL, 0);
-+#endif
- #ifdef __linux__
- value = proc_cpuinfo_field ("model name");
- if (!value) value = proc_cpuinfo_field ("machine");
+--- CPU.xs.orig 2016-06-20 15:01:16 UTC ++++ CPU.xs +@@ -40,6 +40,11 @@ + #define _have_cpu_clock + #define _have_cpu_type + #endif ++#ifdef __FreeBSD__ ++ #include <sys/sysctl.h> ++ #define _have_cpu_type ++ #define _have_cpu_clock ++#endif + #ifdef WINDOWS + /* Registry Functions */ + +@@ -317,6 +322,10 @@ CODE: + int value = proc_cpuinfo_clock(); + if (value) clock = value; + #endif ++#ifdef __FreeBSD__ ++ size_t len = sizeof(clock); ++ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0); ++#endif + #ifdef WINDOWS + char *clock_str = malloc(MAX_IDENT_SIZE); + /*!! untested !!*/ +@@ -356,6 +365,10 @@ CODE: + { + char *value = malloc(MAX_IDENT_SIZE); + int retcode = 0; ++#ifdef __FreeBSD__ ++ size_t len = MAX_IDENT_SIZE; ++ sysctlbyname("hw.model", value, &len, NULL, 0); ++#endif + #ifdef __linux__ + value = proc_cpuinfo_field ("model name"); + if (!value) value = proc_cpuinfo_field ("machine"); diff --git a/devel/ruby-rbprof/Makefile b/devel/ruby-rbprof/Makefile index 71a05e226265..222fb1e99cb5 100644 --- a/devel/ruby-rbprof/Makefile +++ b/devel/ruby-rbprof/Makefile @@ -16,6 +16,8 @@ OPTIONS_DEFINE= DOCS #RUN_DEPENDS= ${RUBY_SITELIBDIR}/runit/error.rb:devel/ruby-unit \ # ${RUBY_SITELIBDIR}/aspectr.rb:devel/ruby-aspectr +USES= dos2unix + USE_RUBY= yes NO_BUILD= yes diff --git a/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb b/devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb index d442ebdbc5cc..36d730ad24f5 100644 --- a/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb +++ b/devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb @@ -1,9 +1,9 @@ ---- aspects/profiler/lib/rbprof.rb.orig Tue Jan 29 07:45:45 2002 -+++ aspects/profiler/lib/rbprof.rb Fri Oct 3 18:02:23 2003 +--- aspects/profiler/lib/rbprof.rb.orig 2016-06-20 14:57:12 UTC ++++ aspects/profiler/lib/rbprof.rb @@ -1,5 +1,5 @@ - require 'aspectr'
--require 'trap_method_definitions'
-+require 'rbprof/trap_method_definitions'
-
- class Profiler < AspectR::Aspect
- def initialize
+ require 'aspectr' +-require 'trap_method_definitions' ++require 'rbprof/trap_method_definitions' + + class Profiler < AspectR::Aspect + def initialize diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile index 019a9b3b2004..c1aaa8527c2b 100644 --- a/devel/sabre/Makefile +++ b/devel/sabre/Makefile @@ -13,13 +13,14 @@ COMMENT= Simple API for Binary REpresentations and an UDF Library LICENSE= LGPL21 WRKSRC= ${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\) -USES= zip +USES= dos2unix zip +DOS2UNIX_GLOB= *.xml *.java USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= dist -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar %%JAVAJARDIR%%/udflib.jar +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar ${JAVAJARDIR}/udflib.jar do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} diff --git a/devel/sabre/files/patch-build.xml b/devel/sabre/files/patch-build.xml index 6ac833349162..43466bae1c51 100644 --- a/devel/sabre/files/patch-build.xml +++ b/devel/sabre/files/patch-build.xml @@ -1,18 +1,11 @@ ---- build.xml.orig 2012-01-10 16:24:58.000000000 +0100 -+++ build.xml 2012-01-10 16:25:09.000000000 +0100 +--- build.xml.orig 2016-06-20 14:54:06 UTC ++++ build.xml @@ -32,7 +32,7 @@ - </target>
-
- <target name="compile" depends="prepare">
-- <javac destdir="${build}/classes" classpathref="classpath.libs" debug="on">
-+ <javac destdir="${build}/classes" source="1.5" target="1.5" classpathref="classpath.libs" debug="on">
- <src path="${src}"/>
- </javac>
- </target>
-@@ -77,4 +77,4 @@ - <filelocation location="${build}/image" childfilesonly="true" />
- </udfimage>
- </target>
--</project> -\ No newline at end of file -+</project> + </target> + + <target name="compile" depends="prepare"> +- <javac destdir="${build}/classes" classpathref="classpath.libs" debug="on"> ++ <javac destdir="${build}/classes" source="1.5" target="1.5" classpathref="classpath.libs" debug="on"> + <src path="${src}"/> + </javac> + </target> diff --git a/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java b/devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java index cef9ccd6a3f0..d263ee58ffe6 100644 --- a/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java +++ b/devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java @@ -1,17 +1,17 @@ ---- src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java.orig 2010-06-28 11:44:55.000000000 +0200 -+++ src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java 2010-06-28 11:46:18.000000000 +0200 -@@ -32,6 +32,14 @@ - // Symlink // TODO: maybe support symlinks
- }
-
-+ public UDFImageBuilderFile( String fileIdentifier, File sourceFile )
-+ throws Exception
-+ {
-+ this(sourceFile);
-+
-+ identifier = fileIdentifier;
-+ }
-+
- public UDFImageBuilderFile( File sourceFile )
- throws Exception
- {
+--- src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java.orig 2016-06-20 14:54:06 UTC ++++ src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java +@@ -32,6 +32,14 @@ public class UDFImageBuilderFile impleme + // Symlink // TODO: maybe support symlinks + } + ++ public UDFImageBuilderFile( String fileIdentifier, File sourceFile ) ++ throws Exception ++ { ++ this(sourceFile); ++ ++ identifier = fileIdentifier; ++ } ++ + public UDFImageBuilderFile( File sourceFile ) + throws Exception + { diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile index a1787dd2bd19..9fe59c30769a 100644 --- a/devel/sdts++/Makefile +++ b/devel/sdts++/Makefile @@ -13,7 +13,7 @@ COMMENT= C++ library for SDTS related development LIB_DEPENDS= libboost_thread.so:devel/boost-libs -DOS2UNIX_FILES= sdts++/io/sio_Utils.cpp +DOS2UNIX_GLOB= *.cpp USES= autoreconf bison dos2unix gmake libtool makeinfo GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include diff --git a/devel/sdts++/files/patch-doc__sdts++.texi b/devel/sdts++/files/patch-doc__sdts++.texi index 102b48bfecb1..2cdd3f1ad769 100644 --- a/devel/sdts++/files/patch-doc__sdts++.texi +++ b/devel/sdts++/files/patch-doc__sdts++.texi @@ -1,5 +1,5 @@ ---- doc/sdts++.texi.orig Wed Jan 12 00:48:47 2000 -+++ doc/sdts++.texi Fri Jul 28 09:12:44 2000 +--- doc/sdts++.texi.orig 2003-06-10 18:15:51 UTC ++++ doc/sdts++.texi @@ -7,6 +7,10 @@ @setfilename sdts++.info @settitle @code{sdts++} Library diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp deleted file mode 100644 index 01e85d38a263..000000000000 --- a/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sdts++/io/sio_8211Converter.cpp.orig 2002-11-25 07:07:43.000000000 +0900 -+++ sdts++/io/sio_8211Converter.cpp 2012-09-12 16:47:10.000000000 +0900 -@@ -16,6 +16,7 @@ - - #include <strstream> - #include <iomanip> -+#include <cstring> - - #include <algorithm> - diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp deleted file mode 100644 index 32988f5a9b40..000000000000 --- a/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sdts++/io/sio_8211DDRField.cpp.orig 2002-11-25 07:07:43.000000000 +0900 -+++ sdts++/io/sio_8211DDRField.cpp 2012-09-12 16:48:13.000000000 +0900 -@@ -18,6 +18,7 @@ - #endif - - #include <strstream> -+#include <cstring> - - - diff --git a/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp b/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp deleted file mode 100644 index a2622c1e8202..000000000000 --- a/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sdts++/io/sio_Utils.cpp.orig 2002-10-08 05:44:24.000000000 +0900 -+++ sdts++/io/sio_Utils.cpp 2012-09-12 16:50:32.000000000 +0900 -@@ -15,6 +15,7 @@ - #endif - - #include <cstdlib> -+#include <cstring> - - - diff --git a/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp b/devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp index 6af1acd323e8..4806a832767b 100644 --- a/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp +++ b/devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp @@ -1,46 +1,41 @@ ---- sdts++/builder/sb_Accessor.cpp.orig 2003-06-11 00:51:40.000000000 +0400 -+++ sdts++/builder/sb_Accessor.cpp 2012-03-11 20:18:18.000000000 +0300 +--- sdts++/builder/sb_Accessor.cpp.orig 2016-06-20 14:59:02 UTC ++++ sdts++/builder/sb_Accessor.cpp @@ -26,6 +26,13 @@ - #include <cctype>
- #include <cstring>
-
+ #include <cctype> + #include <cstring> + +#ifdef __FreeBSD__ +# include <osreldate.h> +# if __FreeBSD_version < 500035 +# include <stlport/iosfwd> +# endif +#endif -+namespace std { using ::mbstate_t; }
- #include <boost/smart_ptr.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
-@@ -155,27 +162,27 @@ -
-
-
--static const char* module_mnemonics_[] =
--{
-- {"CATS"},
-- {"CATD"},
-- {"DDOM"},
-- {"DDSH"},
-- {"MDOM"},
-- {"MDEF"},
-- {"DQHL"},
-- {"DQPA"},
-- {"DQAA"},
-- {"DQLC"},
-- {"DQCG"},
-- {"IDEN"},
-- {"IREF"},
-- {"LDEF"},
-- {"RSDF"},
-- {"STAT"},
-- {"XREF"},
-- {""}
--}; // module_mnemonics
-+static const char* module_mnemonics_[] = -+{ ++namespace std { using ::mbstate_t; } + #include <boost/smart_ptr.hpp> + #include <boost/filesystem/path.hpp> + #include <boost/filesystem/operations.hpp> +@@ -157,24 +164,24 @@ sb_Accessor::~sb_Accessor( ) + + static const char* module_mnemonics_[] = + { +- {"CATS"}, +- {"CATD"}, +- {"DDOM"}, +- {"DDSH"}, +- {"MDOM"}, +- {"MDEF"}, +- {"DQHL"}, +- {"DQPA"}, +- {"DQAA"}, +- {"DQLC"}, +- {"DQCG"}, +- {"IDEN"}, +- {"IREF"}, +- {"LDEF"}, +- {"RSDF"}, +- {"STAT"}, +- {"XREF"}, +- {""} + "CATS", + "CATD", + "DDOM", @@ -59,7 +54,6 @@ + "STAT", + "XREF", + "" -+}; // module_mnemonics -
-
-
+ }; // module_mnemonics + + diff --git a/devel/sdts++/files/patch-sdts++__io__FormatParset.yy b/devel/sdts++/files/patch-sdts++_io_FormatParser.yy index ea268ef8a1ff..edada988d815 100644 --- a/devel/sdts++/files/patch-sdts++__io__FormatParset.yy +++ b/devel/sdts++/files/patch-sdts++_io_FormatParser.yy @@ -1,5 +1,5 @@ ---- sdts++/io/FormatParser.yy.orig 2002-10-08 05:44:24.000000000 +0900 -+++ sdts++/io/FormatParser.yy 2012-09-12 16:53:19.000000000 +0900 +--- sdts++/io/FormatParser.yy.orig 2002-10-07 20:44:24 UTC ++++ sdts++/io/FormatParser.yy @@ -71,6 +71,10 @@ #include <iostream> diff --git a/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp b/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp new file mode 100644 index 000000000000..8d6b7cc476b2 --- /dev/null +++ b/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp @@ -0,0 +1,10 @@ +--- sdts++/io/sio_8211Converter.cpp.orig 2016-06-20 14:59:02 UTC ++++ sdts++/io/sio_8211Converter.cpp +@@ -16,6 +16,7 @@ + + #include <strstream> + #include <iomanip> ++#include <cstring> + + #include <algorithm> + diff --git a/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp b/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp new file mode 100644 index 000000000000..3e8412d076c9 --- /dev/null +++ b/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp @@ -0,0 +1,10 @@ +--- sdts++/io/sio_8211DDRField.cpp.orig 2016-06-20 14:59:02 UTC ++++ sdts++/io/sio_8211DDRField.cpp +@@ -18,6 +18,7 @@ + #endif + + #include <strstream> ++#include <cstring> + + + diff --git a/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp b/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp new file mode 100644 index 000000000000..e3b5baae197e --- /dev/null +++ b/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp @@ -0,0 +1,10 @@ +--- sdts++/io/sio_Utils.cpp.orig 2016-06-20 14:59:02 UTC ++++ sdts++/io/sio_Utils.cpp +@@ -15,6 +15,7 @@ + #endif + + #include <cstdlib> ++#include <cstring> + + + diff --git a/devel/sdts++/files/patch-sysutils__t_basename.cpp b/devel/sdts++/files/patch-sysutils__t_basename.cpp deleted file mode 100644 index 71aef16be9be..000000000000 --- a/devel/sdts++/files/patch-sysutils__t_basename.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sysutils/t_basename.cpp.orig 2002-11-27 09:21:34.000000000 +0900 -+++ sysutils/t_basename.cpp 2012-09-12 16:55:05.000000000 +0900 -@@ -3,6 +3,7 @@ - // - - #include <iostream> -+#include <cstdlib> - - #include "fileutils.h" - diff --git a/devel/sdts++/files/patch-sysutils__t_dirname.cpp b/devel/sdts++/files/patch-sysutils__t_dirname.cpp deleted file mode 100644 index 0616cfbe6daa..000000000000 --- a/devel/sdts++/files/patch-sysutils__t_dirname.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- sysutils/t_dirname.cpp.orig 2002-11-27 09:21:34.000000000 +0900 -+++ sysutils/t_dirname.cpp 2012-09-12 16:54:58.000000000 +0900 -@@ -3,6 +3,7 @@ - // - - #include <iostream> -+#include <cstdlib> - - #include "fileutils.h" - diff --git a/devel/sdts++/files/patch-sysutils__t_stringutils.cpp b/devel/sdts++/files/patch-sysutils__t_stringutils.cpp deleted file mode 100644 index d6c102534b89..000000000000 --- a/devel/sdts++/files/patch-sysutils__t_stringutils.cpp +++ /dev/null @@ -1,9 +0,0 @@ ---- sysutils/t_stringutils.cpp.orig 2001-07-18 05:50:15.000000000 +0900 -+++ sysutils/t_stringutils.cpp 2012-09-12 16:44:29.000000000 +0900 -@@ -5,6 +5,7 @@ - #include <iostream> - #include <string> - #include <cassert> -+#include <cstdlib> - - using namespace std; diff --git a/devel/sdts++/files/patch-sysutils_t__basename.cpp b/devel/sdts++/files/patch-sysutils_t__basename.cpp new file mode 100644 index 000000000000..a2842ead2aa3 --- /dev/null +++ b/devel/sdts++/files/patch-sysutils_t__basename.cpp @@ -0,0 +1,10 @@ +--- sysutils/t_basename.cpp.orig 2016-06-20 14:59:02 UTC ++++ sysutils/t_basename.cpp +@@ -3,6 +3,7 @@ + // + + #include <iostream> ++#include <cstdlib> + + #include "fileutils.h" + diff --git a/devel/sdts++/files/patch-sysutils_t__dirname.cpp b/devel/sdts++/files/patch-sysutils_t__dirname.cpp new file mode 100644 index 000000000000..9f7a7eb14c78 --- /dev/null +++ b/devel/sdts++/files/patch-sysutils_t__dirname.cpp @@ -0,0 +1,10 @@ +--- sysutils/t_dirname.cpp.orig 2016-06-20 14:59:02 UTC ++++ sysutils/t_dirname.cpp +@@ -3,6 +3,7 @@ + // + + #include <iostream> ++#include <cstdlib> + + #include "fileutils.h" + diff --git a/devel/sdts++/files/patch-sysutils_t__stringutils.cpp b/devel/sdts++/files/patch-sysutils_t__stringutils.cpp new file mode 100644 index 000000000000..5c5281598e62 --- /dev/null +++ b/devel/sdts++/files/patch-sysutils_t__stringutils.cpp @@ -0,0 +1,10 @@ +--- sysutils/t_stringutils.cpp.orig 2016-06-20 14:59:02 UTC ++++ sysutils/t_stringutils.cpp +@@ -5,6 +5,7 @@ + #include <iostream> + #include <string> + #include <cassert> ++#include <cstdlib> + + using namespace std; + |