9 files changed, 39 insertions, 144 deletions

diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index d85bdcb07079..38fa35901b56 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tablix2
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	math www
 MASTER_SITES=	http://www.tablix.org/releases/stable/ \
 		http://my.samba.org/
@@ -23,19 +22,13 @@ PVM_ROOT=	${PREFIX}/lib/pvm
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-
-.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=--with-included-gettext \
-		--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=		--mandir=${PREFIX}/man
 
 CONFIGURE_ENV=		CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib \
+			LDFLAGS=-L${PREFIX}/lib \
 			PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
 
 MAN1=	tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \
diff --git a/math/tablix/distinfo b/math/tablix/distinfo
index 55d812ed3251..1f74efce4a45 100644
--- a/math/tablix/distinfo
+++ b/math/tablix/distinfo
@@ -1,3 +1,3 @@
-MD5 (tablix2-0.3.1.tar.gz) = 0b3987eb4c2069341618e887af70f971
-SHA256 (tablix2-0.3.1.tar.gz) = 6bca822fdcf48e95fd727daaaeaddf570d192789ccee49188ca2fefa5cfbb242
-SIZE (tablix2-0.3.1.tar.gz) = 3642902
+MD5 (tablix2-0.3.5.tar.gz) = 87f727ea5daa410c9bf293ab945e9bd7
+SHA256 (tablix2-0.3.5.tar.gz) = 800ad85cb15d654a200a1b72969c219e29cbe5f55d4f092e316e52062083fd1d
+SIZE (tablix2-0.3.5.tar.gz) = 4361294
diff --git a/math/tablix/files/patch-modules-freeperiod.c b/math/tablix/files/patch-modules-freeperiod.c
deleted file mode 100644
index 129c3cea4009..000000000000
--- a/math/tablix/files/patch-modules-freeperiod.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- modules/freeperiod.c.orig	Sat Feb 18 11:49:49 2006
-+++ modules/freeperiod.c	Sat Feb 18 11:52:43 2006
-@@ -188,25 +188,28 @@
- 
- int module_precalc(moduleoption *opt) 
- {
-+	int i;
-+	int timeid, teachid;
-+	tupleinfo *tup;
-+	domain *dom;
-+	struct tlist *tnext;
-+
- 	if ( exclnum == 0 && texcl == NULL )
- 	{
- 		info(_("module '%s' has been loaded, but not used"), "freeperiod.so");
- 		return 0;
- 	}
- 	
--	int i;
--	int timeid, teachid;
- 	timeid = restype_find( "time" )->typeid; 
- 	teachid = restype_find( "teacher" )->typeid;
--	tupleinfo *tup = dat_tuplemap;
--	domain *dom;
-+	tup = dat_tuplemap;
- 	for ( i = 0; i < dat_tuplenum; i++ )
- 	{
-+		struct tlist *tt;
- 		dom = tup[i].dom[timeid];
- 		if(excl!=NULL) {
- 			domain_del( dom, excl, exclnum );
- 		}
--		struct tlist *tt;
- 		if ( ( tt = find_texcl( dat_tuplemap[i].resid[teachid] ) ) )
- 			domain_del( dom, tt->frees, tt->freenum );
- 	}
-@@ -215,7 +218,6 @@
- 		free(excl);
- 	}
- 	
--	struct tlist *tnext;
- 	while(texcl!=NULL) {
- 		tnext=texcl->next;
- 		free( texcl->frees );
-@@ -228,10 +230,10 @@
- 
- int module_init(moduleoption *opt) 
- {
--	precalc_new(module_precalc);
--
- 	int d,p;
- 	moduleoption *result;
-+
-+	precalc_new(module_precalc);
- 
- 	texcl = NULL;
- 	excl = NULL;
diff --git a/math/tablix/files/patch-modules-preferredroom.c b/math/tablix/files/patch-modules-preferredroom.c
deleted file mode 100644
index fa3b3d5a7544..000000000000
--- a/math/tablix/files/patch-modules-preferredroom.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/preferredroom.c.orig	Sat Feb 18 11:56:01 2006
-+++ modules/preferredroom.c	Sat Feb 18 11:57:00 2006
-@@ -182,6 +182,8 @@
- int module_init(moduleoption *opt) 
- {
- 	int c;
-+	fitnessfunc *fitness;
-+
- 	ptroom=malloc(sizeof(*ptroom)*restype_find("teacher")->resnum);
- 	for(c=0;c<restype_find("teacher")->resnum;c++) ptroom[c]=-1;
- 
-@@ -197,8 +199,6 @@
- 		return(-1);
- 	}
- 	
--	fitnessfunc *fitness;
--
- 	precalc_new(module_precalc);
- 
- 	handler_res_new("teacher", "preferred-room", gettroom);
diff --git a/math/tablix/files/patch-modules-sametime.c b/math/tablix/files/patch-modules-sametime.c
deleted file mode 100644
index 96ad1450c5f2..000000000000
--- a/math/tablix/files/patch-modules-sametime.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- modules/sametime.c.orig	Sat Feb 18 11:58:36 2006
-+++ modules/sametime.c	Sat Feb 18 11:59:38 2006
-@@ -90,9 +90,9 @@
- 	resource *res2;
- 	resourcetype *restype;
- 
--	restype=res1->restype;
--
- 	int n;
-+
-+	restype=res1->restype;
- 
- 	res2=res_find(restype, cont);
- 
diff --git a/math/tablix/files/patch-modules-timeplace.c b/math/tablix/files/patch-modules-timeplace.c
deleted file mode 100644
index a561aa3f9b52..000000000000
--- a/math/tablix/files/patch-modules-timeplace.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/timeplace.c.orig	Sun Feb 19 18:54:46 2006
-+++ modules/timeplace.c	Sun Feb 19 19:07:05 2006
-@@ -32,7 +32,21 @@
- #include "config.h"
- #endif
- 
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "module.h"
-+
-+struct cons_t {
-+        int *tuples;
-+        int tuplenum;
-+        int ppb;        /* Periods per block */
-+};
-+
-+static struct cons_t *con=NULL;
-+static int connum=0;
-+static int periods;
- 
- int module_fitness(chromo **c, ext **e, slist **s)
- {
diff --git a/math/tablix/files/patch-po-Makefile.in.in b/math/tablix/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..408a314953d2
--- /dev/null
+++ b/math/tablix/files/patch-po-Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Wed Feb 14 13:44:33 2007
++++ po/Makefile.in.in	Sat Jul 14 18:06:22 2007
+@@ -25,6 +25,7 @@
+ exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
++DATADIRNAME = @DATADIRNAME@
+ localedir = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+ 
diff --git a/math/tablix/files/patch-ttf-export_ttf.c b/math/tablix/files/patch-ttf-export_ttf.c
deleted file mode 100644
index 9801b3c4b44a..000000000000
--- a/math/tablix/files/patch-ttf-export_ttf.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ttf/export_ttf.c.orig	Fri Sep  2 21:30:43 2005
-+++ ttf/export_ttf.c	Tue Nov 22 21:27:53 2005
-@@ -274,10 +274,10 @@
- 
- 	char *oldmodule;
- 
-+	scheme *sc;
-+
- 	oldmodule=curmodule;
- 	curmodule="scheme";
--
--	scheme *sc;
- 
- 	info("TinyScheme, Copyright (c) 2000, Dimitrios Souflis. All rights reserved.");
- 
diff --git a/math/tablix/pkg-plist b/math/tablix/pkg-plist
index 8a2c8cf4a912..33c811a06021 100644
--- a/math/tablix/pkg-plist
+++ b/math/tablix/pkg-plist
@@ -7,18 +7,30 @@ bin/tablix2_test
 lib/pvm/bin/FREEBSD/tablix2
 lib/pvm/bin/FREEBSD/tablix2_kernel
 lib/pvm/bin/FREEBSD/tablix2_output
+lib/tablix2/available.la
+lib/tablix2/available.so
 lib/tablix2/consecutive.la
 lib/tablix2/consecutive.so
 lib/tablix2/events_sameday.la
 lib/tablix2/events_sameday.so
 lib/tablix2/export_csv.la
 lib/tablix2/export_csv.so
+lib/tablix2/export_gnutu.la
+lib/tablix2/export_gnutu.so
 lib/tablix2/export_htmlcss.la
 lib/tablix2/export_htmlcss.so
+lib/tablix2/export_htmlcss2.la
+lib/tablix2/export_htmlcss2.so
 lib/tablix2/export_ttf.la
 lib/tablix2/export_ttf.so
 lib/tablix2/export_vcal.la
 lib/tablix2/export_vcal.so
+lib/tablix2/firstlastequal.la
+lib/tablix2/firstlastequal.so
+lib/tablix2/firstorlast.la
+lib/tablix2/firstorlast.so
+lib/tablix2/fixed.la
+lib/tablix2/fixed.so
 lib/tablix2/fixedtime.la
 lib/tablix2/fixedtime.so
 lib/tablix2/freemorning.la
@@ -27,6 +39,12 @@ lib/tablix2/freeperiod.la
 lib/tablix2/freeperiod.so
 lib/tablix2/holes.la
 lib/tablix2/holes.so
+lib/tablix2/maxconsecutive.la
+lib/tablix2/maxconsecutive.so
+lib/tablix2/maxperday.la
+lib/tablix2/maxperday.so
+lib/tablix2/minrooms.la
+lib/tablix2/minrooms.so
 lib/tablix2/perday.la
 lib/tablix2/perday.so
 lib/tablix2/placecapability.la
@@ -35,12 +53,16 @@ lib/tablix2/preferredroom.la
 lib/tablix2/preferredroom.so
 lib/tablix2/preferredtime.la
 lib/tablix2/preferredtime.so
+lib/tablix2/recurrence.la
+lib/tablix2/recurrence.so
 lib/tablix2/sameday.la
 lib/tablix2/sameday.so
 lib/tablix2/sametime.la
 lib/tablix2/sametime.so
 lib/tablix2/sametimeas.la
 lib/tablix2/sametimeas.so
+lib/tablix2/simplesametime.la
+lib/tablix2/simplesametime.so
 lib/tablix2/timeblocks.la
 lib/tablix2/timeblocks.so
 lib/tablix2/timeblocks_sameday.la
@@ -49,7 +71,7 @@ lib/tablix2/timeplace.la
 lib/tablix2/timeplace.so
 lib/tablix2/walk.la
 lib/tablix2/walk.so
-%%NLS%%share/locale/sl/LC_MESSAGES/tablix2.mo
+share/locale/sl/LC_MESSAGES/tablix2.mo
 share/tablix2/modulesref.xml
 @dirrm lib/tablix2
 @dirrm share/tablix2