mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

misc/auto-multiple-choice: Update to 1.3.0

Browse Source 
PR:		208084
This commit is contained in:
Mark Felder 2016-03-18 02:43:55 +00:00
parent 7b9c8d5afa
commit b6f05d6d3d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=411324
6 changed files with 53 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
misc/auto-multiple-choice/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= auto-multiple-choice
PORTVERSION= 1.2.1
PORTREVISION= 3
PORTVERSION= 1.3.0
CATEGORIES= misc
MASTER_SITES= http://download.gna.org/auto-qcm/
DISTNAME= auto-multiple-choice_${PORTVERSION}_precomp
@ -12,13 +11,20 @@ COMMENT= Multiple-choice questionnaire management with automated marking
LICENSE= GPLv2
LIB_DEPENDS= libnetpbm.so:${PORTSDIR}/graphics/netpbm \
libopencv_highgui.so:${PORTSDIR}/graphics/opencv
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libnetpbm.so:${PORTSDIR}/graphics/netpbm \
libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
RUN_DEPENDS= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender \
p5-Glib-Object-Introspection>=0:${PORTSDIR}/devel/p5-Glib-Object-Introspection \
p5-Gtk2-Notify>=0:${PORTSDIR}/devel/p5-Gtk2-Notify \
p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
p5-Net-CUPS>=0:${PORTSDIR}/print/p5-Net-CUPS \
p5-OpenOffice-OODoc>=0:${PORTSDIR}/textproc/p5-OpenOffice-OODoc \
p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
@ -31,10 +37,9 @@ MANLANG= "" fr ja
SHARED_MIMEINFO_DIR= ${PREFIX}/share/mime/packages
LANG_GTKSOURCEVIEW_DIR= ${PREFIX}/share/gtksourceview-2.0/language-specs
MAKE_JOBS_UNSAFE= yes
USE_TEX= latex texhash
USES+= gettext gmake iconv:build perl5 shared-mime-info
USES+= gettext gmake iconv:build perl5 pkgconfig shared-mime-info
OPTIONS_DEFINE= DOCS

4
misc/auto-multiple-choice/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (auto-multiple-choice_1.2.1_precomp.tar.gz) = 534b1a9cd855532bd6c065a29e09dec2ba07c8ee155317e416260a9d5942420a
SIZE (auto-multiple-choice_1.2.1_precomp.tar.gz) = 6022417
SHA256 (auto-multiple-choice_1.3.0_precomp.tar.gz) = 0c1644947ef316e88bbdcb7ff75237631de219bff3b7d1ba183c2796a18003dd
SIZE (auto-multiple-choice_1.3.0_precomp.tar.gz) = 7342368

137
misc/auto-multiple-choice/files/patch-AMC-traitement-image.c
View File

@ -1,137 +0,0 @@
--- ./AMC-traitement-image.c.orig 2013-07-28 22:22:29.000000000 +0900
+++ ./AMC-traitement-image.c 2014-04-16 17:44:03.000000000 +0900
@@ -218,6 +218,22 @@
printf("CC %d %d\n",n,imax);
}
+#define deplace(_i,_j) \
+ do { \
+ int i = _i, j = _j; \
+ coins[i].x+=delta*(coins[j].x-coins[i].x); \
+ coins[i].y+=delta*(coins[j].y-coins[i].y); \
+ } while (0)
+
+#define restreint(_x,_y) \
+ do { \
+ int *x = _x, *y = _y; \
+ if(*x<0) *x=0; \
+ if(*y<0) *y=0; \
+ if(*x>=tx) *x=tx-1; \
+ if(*y>=ty) *y=ty-1; \
+ } while (0)
+
void mesure_case(pixel **img,int tx,int ty,pixval maxval,
double prop,point *coins) {
int npix,npixnoir,xmin,xmax,ymin,ymax,x,y;
@@ -225,18 +241,6 @@
int i,ok;
double delta;
- void deplace(int i,int j) {
- coins[i].x+=delta*(coins[j].x-coins[i].x);
- coins[i].y+=delta*(coins[j].y-coins[i].y);
- }
-
- void restreint(int *x,int *y) {
- if(*x<0) *x=0;
- if(*y<0) *y=0;
- if(*x>=tx) *x=tx-1;
- if(*y>=ty) *y=ty-1;
- }
-
npix=0;
npixnoir=0;
xmin=tx-1;
@@ -292,47 +296,48 @@
int xmin,xmax,ymin,ymax;
} infocol;
-void repere_magick(pixel **img,int tx,int ty,pixval maxval) {
- infocol *infos;
-
- int ninfo,ninfo_alloc;
- int i,x,y,red;
- int en_couleur;
+int trouve_id(int magick,int exo,int quest,infocol **infos_p,int *ninfo_p,int *ninfo_alloc_p) {
+ int i,ii;
+ ii=-1;
+ for(i=0;i<*ninfo_p;i++) {
+ if((*infos_p)[i].magick==magick
+ && (*infos_p)[i].exo==exo && (*infos_p)[i].quest==quest) ii=i;
+ }
+ if(ii<0) {
+ ii=*ninfo_p;
- int trouve_id(int magick,int exo,int quest) {
- int i,ii;
- ii=-1;
- for(i=0;i<ninfo;i++) {
- if(infos[i].magick==magick
- && infos[i].exo==exo && infos[i].quest==quest) ii=i;
+ if(*ninfo_alloc_p<ii+1) {
+ *ninfo_alloc_p+=INFO_BLOC;
+ *infos_p=(infocol*)realloc(*infos_p,*ninfo_alloc_p*sizeof(infocol));
}
- if(ii<0) {
- ii=ninfo;
- if(ninfo_alloc<ii+1) {
- ninfo_alloc+=INFO_BLOC;
- infos=(infocol*)realloc(infos,ninfo_alloc*sizeof(infocol));
- }
-
- infos[ii].magick=magick;
- infos[ii].exo=exo;
- infos[ii].quest=quest;
- infos[ii].xmin=100000;
- infos[ii].ymin=100000;
- infos[ii].xmax=-1;
- infos[ii].ymax=-1;
- ninfo++;
- }
- return(ii);
+ (*infos_p)[ii].magick=magick;
+ (*infos_p)[ii].exo=exo;
+ (*infos_p)[ii].quest=quest;
+ (*infos_p)[ii].xmin=100000;
+ (*infos_p)[ii].ymin=100000;
+ (*infos_p)[ii].xmax=-1;
+ (*infos_p)[ii].ymax=-1;
+ (*ninfo_p)++;
}
+ return(ii);
+}
- void ajoute(int id,int x,int y) {
- if(x > infos[id].xmax) infos[id].xmax=x;
- if(x < infos[id].xmin) infos[id].xmin=x;
- if(y > infos[id].ymax) infos[id].ymax=y;
- if(y < infos[id].ymin) infos[id].ymin=y;
- }
+#define ajoute(_id,_x,_y) \
+ do { \
+ int id = _id, x = _x, y = _y; \
+ if(x > infos[id].xmax) infos[id].xmax=x; \
+ if(x < infos[id].xmin) infos[id].xmin=x; \
+ if(y > infos[id].ymax) infos[id].ymax=y; \
+ if(y < infos[id].ymin) infos[id].ymin=y; \
+ } while (0)
+
+void repere_magick(pixel **img,int tx,int ty,pixval maxval) {
+ infocol *infos;
+ int ninfo,ninfo_alloc;
+ int i,x,y,red;
+ int en_couleur;
infos=NULL;
ninfo_alloc=0;
@@ -347,7 +352,7 @@
if(red!=PPM_GETG(img[y][x])) en_couleur=1;
if(red!=PPM_GETB(img[y][x])) en_couleur=1;
if(en_couleur)
- ajoute(trouve_id(red,PPM_GETG(img[y][x]),PPM_GETB(img[y][x])),x,y);
+ ajoute(trouve_id(red,PPM_GETG(img[y][x]),PPM_GETB(img[y][x]),&infos,&ninfo,&ninfo_alloc),x,y);
}
}
}

28
misc/auto-multiple-choice/files/patch-Makefile
View File

@ -1,15 +1,15 @@
--- ./Makefile.orig 2013-07-28 22:22:29.000000000 +0900
+++ ./Makefile 2014-03-05 18:40:32.000000000 +0900
@@ -51,7 +51,7 @@
--- Makefile.orig 2016-03-16 08:18:02 UTC
+++ Makefile
@@ -43,7 +43,7 @@ CXXFLAGS ?= -O2
# try to find right names for OpenCV libs
ifeq ($(GCC_OPENCV_LIBS),auto)
-ifeq ($(shell echo 'main(){}' | gcc -xc -lopencv_core - -o /dev/null 2>/dev/null && echo "OK"),OK)
+ifeq ($(shell echo 'main(){}' | $(CC) -xc $(LDFLAGS) -lopencv_core - -o /dev/null 2>/dev/null && echo "OK"),OK)
-ifeq ($(shell echo 'int main(){}' | gcc -xc -lopencv_core - && ( rm -f a.out ; echo "OK")),OK)
+ifeq ($(shell echo 'int main(){}' | $(CC) -xc $(LDFLAGS) -lopencv_core - && ( rm -f a.out ; echo "OK")),OK)
GCC_OPENCV_LIBS:=-lopencv_core -lopencv_highgui -lopencv_imgproc
else
GCC_OPENCV_LIBS:=-lcv -lhighgui -lcxcore
@@ -199,7 +199,7 @@
@@ -210,13 +210,13 @@ endif
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/perl
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MODSDIR)/exec
install -m 0755 $(USER_GROUP) $(MODS) $(DESTDIR)/$(MODSDIR)/perl
@ -18,8 +18,6 @@
install -m 0644 $(USER_GROUP) $(GLADE) $(DESTDIR)/$(MODSDIR)/perl
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(TEXDIR)
install -m 0644 $(USER_GROUP) $(STY) $(DESTDIR)/$(TEXDIR)
@@ -209,7 +209,7 @@
endif
ifneq ($(DESKTOPDIR),)
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DESKTOPDIR)
- install -m 0644 $(USER_GROUP) -T auto-multiple-choice.desktop $(DESTDIR)/$(DESKTOPDIR)/auto-multiple-choice.desktop
@ -27,7 +25,7 @@
endif
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(BINDIR)
install -m 0755 $(USER_GROUP) auto-multiple-choice $(DESTDIR)/$(BINDIR)
@@ -217,7 +217,7 @@
@@ -224,7 +224,7 @@ endif
install -m 0644 $(USER_GROUP) icons/*.svg $(DESTDIR)/$(ICONSDIR)
ifneq ($(PIXDIR),)
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PIXDIR)
@ -36,7 +34,15 @@
endif
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(PERLDIR)/AMC/Export
@@ -247,7 +247,19 @@
@@ -253,6 +253,7 @@ endif
ifneq ($(SYSTEM_TYPE),deb) # with debian, done with dh_install{doc,man}
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(DOCDIR)
install -m 0644 $(USER_GROUP) $(wildcard doc/auto-multiple-choice.??.xml doc/auto-multiple-choice.??.pdf) $(DESTDIR)/$(DOCDIR)
+ rm -f doc/html/images/callouts/.hgempty
cp -r doc/html $(DESTDIR)/$(DOCDIR)
ifeq ($(INSTALL_USER),)
else
@@ -263,7 +264,19 @@ else
chgrp -hR $(INSTALL_GROUP) $(DESTDIR)/$(DOCDIR)
endif
install -d -m 0755 $(USER_GROUP) $(DESTDIR)/$(MAN1DIR)
@ -56,4 +62,4 @@
+ done
endif
# Test
install: install_nodoc install_doc ;

24
misc/auto-multiple-choice/files/patch-Makefile.conf
View File

@ -1,12 +1,11 @@
--- Makefile.conf.orig 2013-07-28 13:22:29 UTC
--- Makefile.conf.orig 2016-03-09 19:17:01 UTC
+++ Makefile.conf
@@ -28,54 +28,63 @@
@@ -28,47 +28,55 @@ SYSTEM_TYPE ?= debian
LATEX_FREE=0
+GCC=$(CC)
+GCC_PP=$(CXX)
+
+CFLAGS = -O2 -I%%LOCALBASE%%/include -I. -DNEEDS_GETLINE
+CXXFLAGS = -O2 -I%%LOCALBASE%%/include -I. -DNEEDS_GETLINE
+LDFLAGS += -L%%LOCALBASE%%/lib
@ -74,21 +73,20 @@
DOCBOOK_DTD=http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
# BUILD : options to compile with netpbm / opencv libraries
@@ -83,7 +91,7 @@ DESKTOP_CAT=Education;
# these arguments are not available with tar: use an empty
# TAR_REPRODUCIBLE_ARGS
GCC_NETPBM=-lnetpbm
-TAR_REPRODUCIBLE_ARGS=--owner=root --group=root --numeric-owner --mtime=@1451602800
+TAR_REPRODUCIBLE_ARGS=--owner=root --group=wheel --numeric-owner --mtime=@1451602800
-GCC_OPENCV=-I /usr/include/opencv
+GCC_OPENCV=-I %%LOCALBASE%%/include/opencv
GCC_OPENCV_LIBS=auto
# same for gzip
# INFO IN DESKTOP FILE
@@ -85,7 +94,7 @@
# INSTALL USER AND GROUP
@@ -93,6 +101,6 @@ GZIP_REPRODUCIBLE_ARGS=-n
ifneq ($(SYSTEM_TYPE),rpm)
-INSTALL_USER=root
INSTALL_USER=root
-INSTALL_GROUP=root
+INSTALL_USER=
+INSTALL_GROUP=
+INSTALL_GROUP=wheel
endif

18
misc/auto-multiple-choice/pkg-plist
View File

@ -1,7 +1,8 @@
bin/auto-multiple-choice
lib/AMC/exec/AMC-buildpdf
lib/AMC/exec/AMC-detect
lib/AMC/exec/AMC-traitement-image
lib/AMC/perl/AMC-analyse.pl
lib/AMC/perl/AMC-annotate.pl
lib/AMC/perl/AMC-annote.pl
lib/AMC/perl/AMC-association-auto.pl
lib/AMC/perl/AMC-association.pl
@ -36,6 +37,7 @@ lib/AMC/perl/AMC-meptex.pl
lib/AMC/perl/AMC-note.pl
lib/AMC/perl/AMC-prepare.pl
lib/AMC/perl/AMC-regroupe.pl
%%SITE_PERL%%/AMC/Annotate.pm
%%SITE_PERL%%/AMC/Basic.pm
%%SITE_PERL%%/AMC/Boite.pm
%%SITE_PERL%%/AMC/Calage.pm
@ -71,20 +73,25 @@ lib/AMC/perl/AMC-regroupe.pl
%%SITE_PERL%%/AMC/Gui/Notes.glade
%%SITE_PERL%%/AMC/Gui/Notes.pm
%%SITE_PERL%%/AMC/Gui/PageArea.pm
%%SITE_PERL%%/AMC/Gui/Prefs.pm
%%SITE_PERL%%/AMC/Gui/WindowSize.pm
%%SITE_PERL%%/AMC/Gui/Zooms.glade
%%SITE_PERL%%/AMC/Gui/Zooms.pm
%%SITE_PERL%%/AMC/Image.pm
%%SITE_PERL%%/AMC/Messages.pm
%%SITE_PERL%%/AMC/NamesFile.pm
%%SITE_PERL%%/AMC/Path.pm
%%SITE_PERL%%/AMC/Print.pm
%%SITE_PERL%%/AMC/Print/cups.pm
%%SITE_PERL%%/AMC/Print/cupslp.pm
%%SITE_PERL%%/AMC/Queue.pm
%%SITE_PERL%%/AMC/Scoring.pm
%%SITE_PERL%%/AMC/ScoringEnv.pm
%%SITE_PERL%%/AMC/State.pm
%%SITE_PERL%%/AMC/Substitute.pm
%%SITE_PERL%%/AMC/Subprocess.pm
man/fr/man1/auto-multiple-choice.1.gz
man/ja/man1/AMC-analyse.1.gz
man/ja/man1/AMC-annote.1.gz
man/ja/man1/AMC-annotate.1.gz
man/ja/man1/AMC-association-auto.1.gz
man/ja/man1/AMC-association.1.gz
man/ja/man1/AMC-export.1.gz
@ -94,10 +101,9 @@ man/ja/man1/AMC-mailing.1.gz
man/ja/man1/AMC-meptex.1.gz
man/ja/man1/AMC-note.1.gz
man/ja/man1/AMC-prepare.1.gz
man/ja/man1/AMC-regroupe.1.gz
man/ja/man1/auto-multiple-choice.1.gz
man/man1/AMC-analyse.1.gz
man/man1/AMC-annote.1.gz
man/man1/AMC-annotate.1.gz
man/man1/AMC-association-auto.1.gz
man/man1/AMC-association.1.gz
man/man1/AMC-export.1.gz
@ -107,7 +113,6 @@ man/man1/AMC-mailing.1.gz
man/man1/AMC-meptex.1.gz
man/man1/AMC-note.1.gz
man/man1/AMC-prepare.1.gz
man/man1/AMC-regroupe.1.gz
man/man1/auto-multiple-choice.1.gz
share/applications/auto-multiple-choice.desktop
%%DATADIR%%/icons/amc-annotate.svg
@ -144,6 +149,7 @@ share/applications/auto-multiple-choice.desktop
%%DATADIR%%/models/ja/simple.tgz
share/gtksourceview-2.0/language-specs/amc-txt.lang
share/locale/ar/LC_MESSAGES/auto-multiple-choice.mo
share/locale/de/LC_MESSAGES/auto-multiple-choice.mo
share/locale/es/LC_MESSAGES/auto-multiple-choice.mo
share/locale/fr/LC_MESSAGES/auto-multiple-choice.mo
share/locale/ja/LC_MESSAGES/auto-multiple-choice.mo