7 files changed, 57 insertions, 15 deletions

diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index 58a1f3adf38f..fcc998197fcf 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tablix2
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	math www
-MASTER_SITES=	http://www.tablix.org/releases/stable/
+MASTER_SITES=	http://www.tablix.org/releases/stable/ \
+		http://my.samba.org/
 
 MAINTAINER=	amir.husaini@gmail.com
 COMMENT=	Free software for solving timetabling problems
@@ -23,10 +23,20 @@ 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_ENV=		CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib \
 			PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
+
 MAN1=	tablix2.1 tablix2_benchmark.1 tablix2_kernel.1 tablix2_output.1 \
 	tablix2_plot.1 tablix2_test.1
 
diff --git a/math/tablix/distinfo b/math/tablix/distinfo
index e451340f67c8..55d812ed3251 100644
--- a/math/tablix/distinfo
+++ b/math/tablix/distinfo
@@ -1,3 +1,3 @@
-MD5 (tablix2-0.3.0.tar.gz) = 887a0a47e876f918544d86bf26849232
-SHA256 (tablix2-0.3.0.tar.gz) = 4316adee7917f2a4c3e22193d5dc5f49c27bb4cdf66a117e16268d2625eff0f5
-SIZE (tablix2-0.3.0.tar.gz) = 3658225
+MD5 (tablix2-0.3.1.tar.gz) = 0b3987eb4c2069341618e887af70f971
+SHA256 (tablix2-0.3.1.tar.gz) = 6bca822fdcf48e95fd727daaaeaddf570d192789ccee49188ca2fefa5cfbb242
+SIZE (tablix2-0.3.1.tar.gz) = 3642902
diff --git a/math/tablix/files/patch-modules-freeperiod.c b/math/tablix/files/patch-modules-freeperiod.c
index 11ac568ee2d3..129c3cea4009 100644
--- a/math/tablix/files/patch-modules-freeperiod.c
+++ b/math/tablix/files/patch-modules-freeperiod.c
@@ -1,5 +1,5 @@
---- modules/freeperiod.c.orig	Fri Sep  2 21:30:38 2005
-+++ modules/freeperiod.c	Tue Nov 22 21:55:58 2005
+--- 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) 
@@ -12,7 +12,7 @@
 +
  	if ( exclnum == 0 && texcl == NULL )
  	{
- 		info(_("module '%s' loaded, but not used"), "freeperiod.so");
+ 		info(_("module '%s' has been loaded, but not used"), "freeperiod.so");
  		return 0;
  	}
  	
diff --git a/math/tablix/files/patch-modules-preferredroom.c b/math/tablix/files/patch-modules-preferredroom.c
index 2df974acbeab..fa3b3d5a7544 100644
--- a/math/tablix/files/patch-modules-preferredroom.c
+++ b/math/tablix/files/patch-modules-preferredroom.c
@@ -1,5 +1,5 @@
---- modules/preferredroom.c.orig	Fri Sep  2 21:30:38 2005
-+++ modules/preferredroom.c	Tue Nov 22 22:19:51 2005
+--- 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) 
  {
diff --git a/math/tablix/files/patch-modules-sametime.c b/math/tablix/files/patch-modules-sametime.c
index b85ab84cd600..96ad1450c5f2 100644
--- a/math/tablix/files/patch-modules-sametime.c
+++ b/math/tablix/files/patch-modules-sametime.c
@@ -1,6 +1,6 @@
---- modules/sametime.c.orig	Sun Sep  4 21:20:52 2005
-+++ modules/sametime.c	Tue Nov 22 21:40:47 2005
-@@ -64,9 +64,9 @@
+--- 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;
  
diff --git a/math/tablix/files/patch-modules-timeplace.c b/math/tablix/files/patch-modules-timeplace.c
new file mode 100644
index 000000000000..a561aa3f9b52
--- /dev/null
+++ b/math/tablix/files/patch-modules-timeplace.c
@@ -0,0 +1,24 @@
+--- 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/pkg-plist b/math/tablix/pkg-plist
index 462ba061166e..8a2c8cf4a912 100644
--- a/math/tablix/pkg-plist
+++ b/math/tablix/pkg-plist
@@ -9,12 +9,16 @@ lib/pvm/bin/FREEBSD/tablix2_kernel
 lib/pvm/bin/FREEBSD/tablix2_output
 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_htmlcss.la
 lib/tablix2/export_htmlcss.so
 lib/tablix2/export_ttf.la
 lib/tablix2/export_ttf.so
+lib/tablix2/export_vcal.la
+lib/tablix2/export_vcal.so
 lib/tablix2/fixedtime.la
 lib/tablix2/fixedtime.so
 lib/tablix2/freemorning.la
@@ -37,11 +41,15 @@ lib/tablix2/sametime.la
 lib/tablix2/sametime.so
 lib/tablix2/sametimeas.la
 lib/tablix2/sametimeas.so
+lib/tablix2/timeblocks.la
+lib/tablix2/timeblocks.so
+lib/tablix2/timeblocks_sameday.la
+lib/tablix2/timeblocks_sameday.so
 lib/tablix2/timeplace.la
 lib/tablix2/timeplace.so
 lib/tablix2/walk.la
 lib/tablix2/walk.so
-share/locale/sl/LC_MESSAGES/tablix2.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/tablix2.mo
 share/tablix2/modulesref.xml
 @dirrm lib/tablix2
 @dirrm share/tablix2