aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/echolinux/Makefile4
-rw-r--r--comms/echolinux/files/patch-echogui_testgui.c10
-rw-r--r--comms/echolinux/files/patch-echogui_testgui_cb.c11
-rw-r--r--comms/echolinux/files/patch-echogui_testgui_main.c11
-rw-r--r--databases/xmysqladmin/Makefile4
-rw-r--r--games/xmastermind/Makefile4
-rw-r--r--graphics/qslim/Makefile7
-rw-r--r--graphics/xfpovray/Makefile4
-rw-r--r--graphics/xmrm/Makefile4
-rw-r--r--lang/fpc/Makefile.units2
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--mail/xfmail/files/patch-src-edit_fl_edit.cpp50
-rw-r--r--mail/xfmail/files/patch-src-ui_xfmail.cpp82
-rw-r--r--math/apc/Makefile4
-rw-r--r--math/xldlas/Makefile4
-rw-r--r--net/xisp/Makefile4
-rw-r--r--x11-toolkits/fpc-xforms/Makefile2
-rw-r--r--x11/gpctool/Makefile8
-rw-r--r--x11/gpctool/files/patch-includes6
-rw-r--r--x11/tycoon/Makefile4
20 files changed, 200 insertions, 29 deletions
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index 8bd787d34fb2..de6ffc5ed527 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -7,7 +7,7 @@
PORTNAME= echolinux
PORTVERSION= 0.17a
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= comms hamradio
MASTER_SITES= SF/cqinet/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio Echolink client for UNIX
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms \
gsm.1:${PORTSDIR}/audio/gsm
post-patch:
diff --git a/comms/echolinux/files/patch-echogui_testgui.c b/comms/echolinux/files/patch-echogui_testgui.c
new file mode 100644
index 000000000000..914032560030
--- /dev/null
+++ b/comms/echolinux/files/patch-echogui_testgui.c
@@ -0,0 +1,10 @@
+--- echogui/testgui.c.orig 2011-09-06 14:21:37.000000000 +0200
++++ echogui/testgui.c 2011-09-06 14:21:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ /* Form definition file generated with fdesign. */
+
+-#include <X11/forms.h>
++#include <forms.h>
+ #include <stdlib.h>
+ #include "testgui.h"
+
diff --git a/comms/echolinux/files/patch-echogui_testgui_cb.c b/comms/echolinux/files/patch-echogui_testgui_cb.c
new file mode 100644
index 000000000000..12bc35c1185a
--- /dev/null
+++ b/comms/echolinux/files/patch-echogui_testgui_cb.c
@@ -0,0 +1,11 @@
+--- echogui/testgui_cb.c.orig 2011-09-06 14:20:54.000000000 +0200
++++ echogui/testgui_cb.c 2011-09-06 14:20:57.000000000 +0200
+@@ -14,7 +14,7 @@
+ #include <linux/soundcard.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+-#include <X11/forms.h>
++#include <forms.h>
+ #include <math.h>
+ #include <signal.h>
+ #include <pthread.h>
diff --git a/comms/echolinux/files/patch-echogui_testgui_main.c b/comms/echolinux/files/patch-echogui_testgui_main.c
new file mode 100644
index 000000000000..86a5b0f77f5e
--- /dev/null
+++ b/comms/echolinux/files/patch-echogui_testgui_main.c
@@ -0,0 +1,11 @@
+--- echogui/testgui_main.c.orig 2011-09-06 14:19:54.000000000 +0200
++++ echogui/testgui_main.c 2011-09-06 14:20:09.000000000 +0200
+@@ -16,7 +16,7 @@
+ #include <linux/soundcard.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+-#include <X11/forms.h>
++#include <forms.h>
+ #include <string.h>
+ #include <math.h>
+ #include <pthread.h>
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index dd9184cade37..e2c186bfdc13 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmysqladmin
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Contrib/Old-Versions
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= Contrib/Old-Versions
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 front end to the mysqladmin command of the MySQL database engine
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client
USE_XORG= xpm
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 2ab2ac3856b4..8c082039fdf0 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmastermind
PORTVERSION= 0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
COMMENT= Mastermind game for X Window System
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
USE_XORG= x11 xpm
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index a4e4febc7de2..b7a210366efc 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -8,9 +8,10 @@
PORTNAME= qslim
PORTVERSION= 2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= http://graphics.cs.uiuc.edu/~garland/dist/ CENKES
+MASTER_SITES= http://mgarland.org/files/dist/ \
+ CENKES
MAINTAINER= ports@FreeBSD.org
COMMENT= SlimKit Surface Modeling Tools
@@ -18,7 +19,7 @@ COMMENT= SlimKit Surface Modeling Tools
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
gfx.0:${PORTSDIR}/graphics/libgfx \
- forms.1:${PORTSDIR}/x11-toolkits/xforms
+ forms.2:${PORTSDIR}/x11-toolkits/xforms
CONFIGURE_WRKSRC= ${WRKSRC}/mixkit
BUILD_WRKSRC= ${WRKSRC}/mixkit/src
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 01cebcb75818..032cf44fabd5 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfpovray
PORTVERSION= 1.3.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
${MASTER_SITE_SUNSITE}
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface to POV-Ray
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta
USE_IMAKE= yes
diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile
index 75091d137e6e..959981430a54 100644
--- a/graphics/xmrm/Makefile
+++ b/graphics/xmrm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmrm
PORTVERSION= 2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cg.tuwien.ac.at/pub/linux/xmrm/ \
ftp://ftp.uni-passau.de/mount/common.lib.archive.unix/Graphic/xmrm/
@@ -22,7 +22,7 @@ EXPIRATION_DATE= 2011-09-01
RUN_DEPENDS= mpeg:${PORTSDIR}/multimedia/mpeg \
mpeg_play:${PORTSDIR}/multimedia/mpeg_play
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms \
tiff.4:${PORTSDIR}/graphics/tiff
USE_GL= yes
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 73aeaa5de693..8e5ecb2d40b2 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -80,7 +80,7 @@ LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick
.if ${PKGNAMESUFFIX} == "-xforms"
. if defined(WITH_XFORMS)
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
. endif
HAVE_EXAMPLES= true
.endif
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index d629d82214ba..2d65e8e47333 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfmail
PORTVERSION= 1.5.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail
MASTER_SITES= ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/ \
ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/ \
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION}/source/
MAINTAINER= ports@FreeBSD.org
COMMENT= An X Window System application for receiving electronic mail
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms \
gdbm.3:${PORTSDIR}/databases/gdbm
USE_AUTOTOOLS= libtool
diff --git a/mail/xfmail/files/patch-src-edit_fl_edit.cpp b/mail/xfmail/files/patch-src-edit_fl_edit.cpp
new file mode 100644
index 000000000000..7cf71f4edad2
--- /dev/null
+++ b/mail/xfmail/files/patch-src-edit_fl_edit.cpp
@@ -0,0 +1,50 @@
+--- src/editor/fl_edit.cpp.orig 2011-09-06 15:28:04.000000000 +0200
++++ src/editor/fl_edit.cpp 2011-09-06 15:29:22.000000000 +0200
+@@ -63,6 +63,30 @@
+ #include "textbuf.h"
+ #include "fl_error.h"
+
++
++/*
++ * This belongs to xforms' implementation
++ */
++
++#define IS_FLATBOX( bt ) ( ( bt ) == FL_FRAME_BOX \
++ || ( bt ) == FL_EMBOSSED_BOX \
++ || ( bt ) == FL_BORDER_BOX \
++ || ( bt ) == FL_ROUNDED_BOX )
++
++int
++fli_get_default_scrollbarsize( FL_OBJECT * ob )
++{
++ int delta = ( FL_abs( ob->bw ) + 3 * ( ob->bw > 0 ) );
++ int flat = IS_FLATBOX( ob->boxtype ) ? 2 : 0;
++
++ if ( ob->w > 250 && ob->h > 250 )
++ return 15 + delta - flat;
++ else if ( ob->w < 150 || ob->h < 150 )
++ return 13 + delta - flat;
++ else
++ return 14 + delta - flat;
++}
++
+ /***********************************************************************
+ *
+ * Some definitions
+@@ -107,7 +131,6 @@
+ #define TEXT_X_OFFSET 2
+ #define TEXT_Y_OFFSET 0
+
+-extern "C" int fl_get_default_scrollbarsize(FL_OBJECT *);
+ extern "C" void fl_add_child(FL_OBJECT *, FL_OBJECT *);
+
+ #define FL_ALL_MASK (FL_ALT_MASK|FL_CONTROL_MASK|FL_SHIFT_MASK)
+@@ -3200,7 +3223,7 @@
+
+ /* scrollbar section */
+ spec->v_on = spec->h_on = 0;
+- spec->vw = spec->hh = fl_get_default_scrollbarsize(ob);
++ spec->vw = spec->hh = fli_get_default_scrollbarsize(ob);
+ spec->sb =
+ fl_create_scrollbar(FL_VERT_THIN_SCROLLBAR, x + w - spec->vw, y,
+ spec->vw, h, "");
diff --git a/mail/xfmail/files/patch-src-ui_xfmail.cpp b/mail/xfmail/files/patch-src-ui_xfmail.cpp
new file mode 100644
index 000000000000..83152bbe1564
--- /dev/null
+++ b/mail/xfmail/files/patch-src-ui_xfmail.cpp
@@ -0,0 +1,82 @@
+--- src/ui/xfmail.cpp.orig 2011-09-06 15:08:01.000000000 +0200
++++ src/ui/xfmail.cpp 2011-09-06 15:28:40.000000000 +0200
+@@ -42,6 +42,70 @@
+ #include "addrbook_util.h"
+ #include "tip.h"
+
++
++/*
++ * This belongs to xforms' implementation
++ */
++enum {
++ FLI_FIND_INPUT,
++ FLI_FIND_AUTOMATIC,
++ FLI_FIND_MOUSE,
++ FLI_FIND_CANVAS,
++ FLI_FIND_KEYSPECIAL,
++ FLI_FIND_RETURN
++};
++
++FL_OBJECT *
++fli_find_object( FL_OBJECT * obj,
++ int find,
++ FL_Coord mx,
++ FL_Coord my )
++{
++ while ( obj )
++ {
++ if ( obj->objclass != FL_BEGIN_GROUP
++ && obj->objclass != FL_END_GROUP
++ && obj->visible
++ && ( obj->active
++ || ( obj->posthandle && ! obj->active )
++ || ( obj->tooltip && *obj->tooltip && ! obj->active ) ) )
++ {
++ if ( find == FLI_FIND_INPUT && obj->input && obj->active )
++ return obj;
++
++ if ( find == FLI_FIND_AUTOMATIC && obj->automatic )
++ return obj;
++
++ if ( find == FLI_FIND_RETURN && obj->type == FL_RETURN_BUTTON )
++ return obj;
++
++ if ( find == FLI_FIND_MOUSE
++ && mx >= obj->x
++ && mx <= obj->x + obj->w
++ && my >= obj->y
++ && my <= obj->y + obj->h )
++ return obj;
++
++ if ( find == FLI_FIND_KEYSPECIAL && obj->wantkey & FL_KEY_SPECIAL )
++ return obj;
++ }
++
++ obj = obj->next;
++ }
++
++ return NULL;
++}
++
++
++FL_OBJECT *
++fli_find_first( FL_FORM * form,
++ int find,
++ FL_Coord mx,
++ FL_Coord my )
++{
++ return fli_find_object( form->first, find, mx, my );
++}
++
+ static void usage(char *s, int die) {
+ char **q = helps;
+
+@@ -486,7 +550,7 @@
+ break;
+
+ case FL_MOUSE:
+- obj = fl_find_first(main_form, FL_FIND_MOUSE, mx, my);
++ obj = fli_find_first(main_form, FLI_FIND_MOUSE, mx, my);
+
+ switch(dragndrop) {
+ case -1:
diff --git a/math/apc/Makefile b/math/apc/Makefile
index d10eb7268420..e1d75b0bf65e 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apc
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= arved
MAINTAINER= ports@FreeBSD.org
COMMENT= An xforms based Auto Payment Calculator
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
USE_XORG= x11 xpm
MAN1= apc.1
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 0f31c8096a57..f9914f00ef6b 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xldlas
PORTVERSION= 0.85
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/visualization
@@ -16,7 +16,7 @@ EXTRACT_SUFX= -source.tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= An XForms-based statistics package
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
WRKSRC= ${WRKDIR}/xldlas
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 4fa3323fd456..52c7afd0b4d5 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xisp
PORTVERSION= 2.7p4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= http://xisp.hellug.gr/release/
@@ -16,7 +16,7 @@ PATCH_SITES= http://www.ml-search.com/xisp/distfiles/
MAINTAINER= tm@onepost.net
COMMENT= A user-friendly X interface to pppd/chat
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
USE_XORG= xpm
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index 326a2c258cc4..6a1f1fa7a0a4 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits lang
PKGNAMESUFFIX= -xforms
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index cbd037648ebb..47898b8cbe8a 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpctool
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 math graphics
MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
DISTNAME= gpct${PORTVERSION:S/.//g}
@@ -16,7 +16,7 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Evaluation tool for the Generic Polygon Clipper library
LIB_DEPENDS= gpc:${PORTSDIR}/devel/libgpc \
- formsGL:${PORTSDIR}/x11-toolkits/xforms
+ formsGL.2:${PORTSDIR}/x11-toolkits/xforms
USE_ZIP= yes
USE_GL= yes
@@ -29,4 +29,8 @@ MAKEFILE= ${FILESDIR}/BSDmakefile
EXTRACT_BEFORE_ARGS=-qoa
EXTRACT_AFTER_ARGS=-d ${WRKDIR} -x ${DISTNAME}/gpc.? ${DISTNAME}/gl.c
+post-patch:
+ ${REINPLACE_CMD} -e 's|FALSE|false|g' \
+ ${WRKSRC}/callbacks.c ${WRKSRC}/graphics.c
+
.include <bsd.port.mk>
diff --git a/x11/gpctool/files/patch-includes b/x11/gpctool/files/patch-includes
index 8935df38be81..3ed8ea7c2c1a 100644
--- a/x11/gpctool/files/patch-includes
+++ b/x11/gpctool/files/patch-includes
@@ -17,7 +17,7 @@
--- callbacks.c Tue Jul 4 10:28:09 2000
+++ callbacks.c Sat Oct 22 02:51:38 2005
-@@ -30,7 +30,6 @@
+@@ -30,7 +30,7 @@
-#include "forms.h"
@@ -25,15 +25,17 @@
-#include "gpctool.h"
+#include <forms.h>
+#include <stdlib.h>
++#include <stdbool.h>
#include "appl.h"
/*
--- graphics.c Tue Jul 4 10:28:10 2000
+++ graphics.c Sat Oct 22 02:53:08 2005
-@@ -30,5 +30,5 @@
+@@ -30,5 +30,6 @@
-#include "gpc.h"
+#include <gpc.h>
++#include <stdbool.h>
#include "appl.h"
#include <float.h>
@@ -37,4 +37,5 @@
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 36080c21df29..a178ed2c51bb 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tycoon
PORTVERSION= 1.07o
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= ports@FreeBSD.org
COMMENT= A nifty set of desktop apps, including floating buttons
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
USE_IMAKE= yes
USE_XORG= xaw
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 02:33:33 +0000