Attachment 110025 Details for Bug 151126 – file.diff

[patch] file.diff

file.diff (text/plain), 10.89 KB, created by Leinier Cruz Salfran on 2010-09-30 22:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leinier Cruz Salfran

Created: 2010-09-30 22:30:01 UTC

Size: 10.89 KB

patch

obsolete

>diff -ruN /usr/ports/deskutils/fet/Makefile fet/Makefile
>--- /usr/ports/deskutils/fet/Makefile	2010-05-31 00:01:34.000000000 -0400
>+++ fet/Makefile	2010-09-30 17:08:34.000000000 -0400
>@@ -6,15 +6,17 @@
> #
> 
> PORTNAME=	fet
>-PORTVERSION=	5.13.3
>-CATEGORIES=	deskutils kde
>+PORTVERSION=	5.14.2
>+CATEGORIES=	deskutils kde x11
> MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
> 		http://lalescu.ro/liviu/fet/download/old/ \
> 		http://timetabling.de/download/ \
>-		http://timetabling.de/download/old/
>+		http://timetabling.de/download/old/ \
>+		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/
> 
> MAINTAINER=	salfrancl@yahoo.es
> COMMENT=	FET is free timetabling software
>+LICENSE=	GPLv2
> 
> USE_BZIP2=	yes
> USE_QT_VER=	4
>@@ -26,8 +28,13 @@
> 		LIBS+=-L${LOCALBASE}/lib
> MAKE_JOBS_SAFE=	yes
> 
>-PLIST_FILES=	bin/fet
> MAN1=		fet.1
>+DESKTOP_ENTRIES=	"FET" \
>+			"Free timetable software" \
>+			"" \
>+			"fet" \
>+			"Application;Education;" \
>+			true
> 
> do-configure:
> 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
>@@ -38,5 +45,8 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/fet ${PREFIX}/bin
> 	${MKDIR} ${PREFIX}/man/man1
> 	${INSTALL_MAN} ${WRKSRC}/doc/fet.1 ${PREFIX}/man/man1
>+	${MKDIR} ${PREFIX}/share/${PORTNAME}/examples
>+	${CP} -R ${WRKSRC}/examples/* \
>+		${PREFIX}/share/${PORTNAME}/examples
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/deskutils/fet/distinfo fet/distinfo
>--- /usr/ports/deskutils/fet/distinfo	2010-05-31 00:01:34.000000000 -0400
>+++ fet/distinfo	2010-09-30 13:52:30.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (fet-5.13.3.tar.bz2) = 2c5e8583971a49eac4388df4cac4a039
>-SHA256 (fet-5.13.3.tar.bz2) = 465a1e8460b20ea0e4284a0be51b44608fe720792e0bf32f094ffaf99e90711c
>-SIZE (fet-5.13.3.tar.bz2) = 5783146
>+MD5 (fet-5.14.2.tar.bz2) = fa6f33a5df22edd231c9f51fd257e120
>+SHA256 (fet-5.14.2.tar.bz2) = fc6849ef410936f7167a1683608228c89ddd9d6caaee3c7b8b6b6fdebd3ca2f9
>+SIZE (fet-5.14.2.tar.bz2) = 5972903
>diff -ruN /usr/ports/deskutils/fet/pkg-descr fet/pkg-descr
>--- /usr/ports/deskutils/fet/pkg-descr	2010-05-31 00:01:34.000000000 -0400
>+++ fet/pkg-descr	2010-09-30 13:34:30.000000000 -0400
>@@ -1,10 +1,14 @@
>-FET is free timetabling software. This program aims to automatically
>-generate the timetable of a school, high-school or university. It
>-may be used for other timetabling purposes.
>+FET is open source free software for automatically scheduling the timetable
>+of a school, high-school or university. It uses a fast and efficient
>+timetabling algorithm.
> 
>-FET can mean "Free Educational Timetabling" (the "E" in the middle
>-may also stand for other words, based on your personal preference).
>+Usually, FET is able to solve a complicated timetable in maximum 5-20 minutes.
>+For simpler timetables, it may take a shorter time, under 5 minutes (in some
>+cases, a matter of seconds). For extremely difficult timetables, it may take a
>+longer time, a matter of hours.
> 
>-LICENSE: GPL
>+FET can mean "Free Educational Timetabling" (the "E" in the middle may also
>+stand for other words, based on your personal preference).
> 
>-WWW:	http://lalescu.ro/liviu/fet/
>+
>+WWW: http://lalescu.ro/liviu/fet/
>diff -ruN /usr/ports/deskutils/fet/pkg-plist fet/pkg-plist
>--- /usr/ports/deskutils/fet/pkg-plist	1969-12-31 19:00:00.000000000 -0500
>+++ fet/pkg-plist	2010-09-30 17:06:25.000000000 -0400
>@@ -0,0 +1,140 @@
>+bin/fet
>+man/man1/fet.1.gz
>+share/applications/fet.desktop
>+share/fet/examples/Belize/Sacred-Heart-College/shc-2007/sacred_heart_college.fet
>+share/fet/examples/Belize/Sacred-Heart-College/shc-2007/shc_6_gaps_per_teacher.fet
>+share/fet/examples/Belize/Sacred-Heart-College/shc-2008/shc-prelim-08.fet
>+share/fet/examples/Brazil/Brazil-more-difficult.fet
>+share/fet/examples/Brazil/Brazil.fet
>+share/fet/examples/Bulgaria/Lom_high_school_2007-2008.fet
>+share/fet/examples/Denmark/small-school.fet
>+share/fet/examples/Germany/DGS-Pro/dgspro200809.fet
>+share/fet/examples/Germany/DGS-Pro/older/DGS_Pro_Germany.fet
>+share/fet/examples/Germany/secondary-school-1/constraints-min-n-days-100-few-0/german-100_and_0.fet
>+share/fet/examples/Germany/secondary-school-1/older/secondary_school.fet
>+share/fet/examples/Germany/secondary-school-1/using_subactivities_constraints/german_subact_constr.fet
>+share/fet/examples/Germany/secondary-school-2/GYR-5-gaps-per-teacher-readme.txt
>+share/fet/examples/Germany/secondary-school-2/GYR-5-gaps-per-teacher.fet
>+share/fet/examples/Germany/secondary-school-2/GYR-more-difficult-readme.txt
>+share/fet/examples/Germany/secondary-school-2/GYR-more-difficult.fet
>+share/fet/examples/Germany/secondary-school-2/GYR-readme.txt
>+share/fet/examples/Germany/secondary-school-2/GYR.fet
>+share/fet/examples/Greece/Corfu/THE-2008-2009-exams-sep.fet
>+share/fet/examples/Greece/Pireus-difficult-warn/8th-highschool-readme.txt
>+share/fet/examples/Greece/Pireus-difficult-warn/8th-highschool.fet
>+share/fet/examples/Greece/Vartholomio/2008-2009.fet
>+share/fet/examples/Hong-Kong/Yew-Chung-Intl-School/2008-09-difficult.fet
>+share/fet/examples/Hungary/Bethlen/2007-2008-difficult/Bethlen_2007_2008.fet
>+share/fet/examples/Hungary/Bethlen/2008-2009/newer/Bethlen-2008-2009.fet
>+share/fet/examples/Hungary/Bethlen/2008-2009/older/Bethlen-2008-2009-old.fet
>+share/fet/examples/India/anna-university/timetable_July_Nov_09_9.fet
>+share/fet/examples/Iran/Sharif-University/Sharif.fet
>+share/fet/examples/Italy/2007/difficult/highschool-Ancona.fet
>+share/fet/examples/Italy/2007/simple/simpler-italian.fet
>+share/fet/examples/Italy/2009/liceo-scientifico.fet
>+share/fet/examples/Italy/2010/Liceo-2010.fet
>+share/fet/examples/Morocco/Hadkourt/lycee-Farabi-readme-Arabic.txt
>+share/fet/examples/Morocco/Hadkourt/lycee-Farabi-readme-English.txt
>+share/fet/examples/Morocco/Hadkourt/lycee-Farabi.fet
>+share/fet/examples/Morocco/readme-morocco.txt
>+share/fet/examples/Namibia/by-Bobby/set-1/PBS.fet
>+share/fet/examples/Namibia/by-Bobby/set-1/Van_RhynFinal.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/FGPS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/JMSS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/KPS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/MAPS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/PutSS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/Shipena.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/WTHS.fet
>+share/fet/examples/Namibia/by-Bobby/set-2/may-take-hours/CONCORDIA.fet
>+share/fet/examples/Namibia/by-Willy/highlands_christian_school.fet
>+share/fet/examples/Romania/Faculty-Computers-Craiova/computers-craiova.fet
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2007-2008-sem-2/Econ-Timisoara.fet
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2008-2009-sem-1/econ-tim-ver8.fet
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/econ-v0.8-readme.txt
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1/econ-v0.8.fet
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2/v1_7-readme.txt
>+share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2/v1_7.fet
>+share/fet/examples/Romania/Oradea/FS-2008-2009-difficult.fet
>+share/fet/examples/Romania/Oradea/school-10-oradea-2007-2008.fet
>+share/fet/examples/Romania/Pedagogic-High-School-Tg-Mures/2006-2007.fet
>+share/fet/examples/Romania/Pedagogic-High-School-Tg-Mures/2007-2008_sem1-a.fet
>+share/fet/examples/Romania/Pedagogic-High-School-Tg-Mures/2007-2008_sem1-d.fet
>+share/fet/examples/Saudi-Arabia/Arabic_saudi_1.fet
>+share/fet/examples/Saudi-Arabia/Arabic_saudi_2.fet
>+share/fet/examples/Saudi-Arabia/Arabic_saudi_3.fet
>+share/fet/examples/South-Africa/difficult/Collegiate_Junior_School2.fet
>+share/fet/examples/South-Africa/difficult/Insight_Learning_Centre2.fet
>+share/fet/examples/Spain/Spanish_school.fet
>+share/fet/examples/Sudan/Khartoum-2010-02-13-readme.txt
>+share/fet/examples/Sudan/Khartoum-2010-02-13.fet
>+share/fet/examples/United-Kingdom/Hopwood/Hopwood.fet
>+share/licenses/fet-5.14.2/GPLv2
>+share/licenses/fet-5.14.2/LICENSE
>+share/licenses/fet-5.14.2/catalog.mk
>+@dirrm share/licenses/fet-5.14.2
>+@dirrm share/licenses
>+@dirrm share/fet/examples/United-Kingdom/Hopwood
>+@dirrm share/fet/examples/United-Kingdom
>+@dirrm share/fet/examples/Sudan
>+@dirrm share/fet/examples/Spain
>+@dirrm share/fet/examples/South-Africa/difficult
>+@dirrm share/fet/examples/South-Africa
>+@dirrm share/fet/examples/Saudi-Arabia
>+@dirrm share/fet/examples/Romania/Pedagogic-High-School-Tg-Mures
>+@dirrm share/fet/examples/Romania/Oradea
>+@dirrm share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-2
>+@dirrm share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2009-2010-sem-1
>+@dirrm share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2008-2009-sem-1
>+@dirrm share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult/2007-2008-sem-2
>+@dirrm share/fet/examples/Romania/Faculty-Econ-Timisoara-difficult
>+@dirrm share/fet/examples/Romania/Faculty-Computers-Craiova
>+@dirrm share/fet/examples/Romania
>+@dirrm share/fet/examples/Namibia/by-Willy
>+@dirrm share/fet/examples/Namibia/by-Bobby/set-2/may-take-hours
>+@dirrm share/fet/examples/Namibia/by-Bobby/set-2
>+@dirrm share/fet/examples/Namibia/by-Bobby/set-1
>+@dirrm share/fet/examples/Namibia/by-Bobby
>+@dirrm share/fet/examples/Namibia
>+@dirrm share/fet/examples/Morocco/Hadkourt
>+@dirrm share/fet/examples/Morocco
>+@dirrm share/fet/examples/Italy/2010
>+@dirrm share/fet/examples/Italy/2009
>+@dirrm share/fet/examples/Italy/2007/simple
>+@dirrm share/fet/examples/Italy/2007/difficult
>+@dirrm share/fet/examples/Italy/2007
>+@dirrm share/fet/examples/Italy
>+@dirrm share/fet/examples/Iran/Sharif-University
>+@dirrm share/fet/examples/Iran
>+@dirrm share/fet/examples/India/anna-university
>+@dirrm share/fet/examples/India
>+@dirrm share/fet/examples/Hungary/Bethlen/2008-2009/older
>+@dirrm share/fet/examples/Hungary/Bethlen/2008-2009/newer
>+@dirrm share/fet/examples/Hungary/Bethlen/2008-2009
>+@dirrm share/fet/examples/Hungary/Bethlen/2007-2008-difficult
>+@dirrm share/fet/examples/Hungary/Bethlen
>+@dirrm share/fet/examples/Hungary
>+@dirrm share/fet/examples/Hong-Kong/Yew-Chung-Intl-School
>+@dirrm share/fet/examples/Hong-Kong
>+@dirrm share/fet/examples/Greece/Vartholomio
>+@dirrm share/fet/examples/Greece/Pireus-difficult-warn
>+@dirrm share/fet/examples/Greece/Corfu
>+@dirrm share/fet/examples/Greece
>+@dirrm share/fet/examples/Germany/secondary-school-2
>+@dirrm share/fet/examples/Germany/secondary-school-1/using_subactivities_constraints
>+@dirrm share/fet/examples/Germany/secondary-school-1/older
>+@dirrm share/fet/examples/Germany/secondary-school-1/constraints-min-n-days-100-few-0
>+@dirrm share/fet/examples/Germany/secondary-school-1
>+@dirrm share/fet/examples/Germany/DGS-Pro/older
>+@dirrm share/fet/examples/Germany/DGS-Pro
>+@dirrm share/fet/examples/Germany
>+@dirrm share/fet/examples/Denmark
>+@dirrm share/fet/examples/Bulgaria
>+@dirrm share/fet/examples/Brazil
>+@dirrm share/fet/examples/Belize/Sacred-Heart-College/shc-2008
>+@dirrm share/fet/examples/Belize/Sacred-Heart-College/shc-2007
>+@dirrm share/fet/examples/Belize/Sacred-Heart-College
>+@dirrm share/fet/examples/Belize
>+@dirrm share/fet/examples
>+@dirrm share/fet
>+@dirrm share/applications

Actions: View | Diff

Attachments on bug 151126: 110025