Index: head/misc/auto-multiple-choice/files/patch-Makefile.conf =================================================================== --- head/misc/auto-multiple-choice/files/patch-Makefile.conf (revision 371412) +++ head/misc/auto-multiple-choice/files/patch-Makefile.conf (revision 371413) @@ -1,92 +1,94 @@ ---- ./Makefile.conf.orig 2013-07-28 22:22:29.000000000 +0900 -+++ ./Makefile.conf 2014-03-05 18:41:03.000000000 +0900 +--- Makefile.conf.orig 2013-07-28 13:22:29 UTC ++++ Makefile.conf @@ -28,54 +28,63 @@ 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 + # INSTALLATION : where to install parts of the package ? # directory for executable -BINDIR=/usr/bin +BINDIR=%%PREFIX%%/bin # directory for perl modules -PERLDIR=/usr/share/perl5 +PERLDIR=%%PREFIX%%/%%SITE_PERL_REL%% # directory for some AMC executables, not to be used by end-user -MODSDIR=/usr/lib/AMC +MODSDIR=%%PREFIX%%/lib/AMC # directory for LaTeX style file -TEXDIR=/usr/share/texmf/tex/latex/AMC +TEXDIR=%%PREFIX%%/%%TEXMFLOCALDIR%%/tex/latex/AMC # directory for LaTeX doc -TEXDOCDIR=/usr/share/doc/texmf/AMC/ +TEXDOCDIR=%%PREFIX%%/%%TEXMFLOCALDIR%%/doc/latex/AMC/ # directory for man (1) files -MAN1DIR=/usr/share/man/man1 +MAN1DIR=%%MANPREFIX%%/man/man1 +FRMAN1DIR=%%MANPREFIX%%/man/fr/man1 +JAMAN1DIR=%%MANPREFIX%%/man/ja/man1 # directory for desktop file -DESKTOPDIR=/usr/share/applications +DESKTOPDIR=%%PREFIX%%/share/applications # directory for icons (svg) -ICONSDIR=/usr/share/auto-multiple-choice/icons +ICONSDIR=%%DATADIR%%/icons # directory for icons (xpm) -PIXDIR=/usr/share/pixmaps +PIXDIR=%%PREFIX%%/share/pixmaps # directory for locales (MO files will be put in # $(LOCALEDIR)/fr/LC_MESSAGES for example) -LOCALEDIR=/usr/share/locale +LOCALEDIR=%%PREFIX%%/share/locale # directory for AMC packaged models -MODELSDIR=/usr/share/auto-multiple-choice/models +MODELSDIR=%%DATADIR%%/models # directory for documentation (will use html/auto-multiple-choice.* subdirs for HTML docs) -DOCDIR=/usr/share/doc/auto-multiple-choice-doc +DOCDIR=%%DOCSDIR%% # directory for Shared MIME-info Database -SHARED_MIMEINFO_DIR=/usr/share/mime/packages +SHARED_MIMEINFO_DIR=%%SHARED_MIMEINFO_DIR%% # directory for gtksourceview/gedit languages highlighting syntax -LANG_GTKSOURCEVIEW_DIR=/usr/share/gtksourceview-3.0/language-specs +LANG_GTKSOURCEVIEW_DIR=%%LANG_GTKSOURCEVIEW_DIR%% # BUILD : where to find some files used for building AMC ? # URLs can be used if XML catalogs are present. -#DOCBOOK_MAN_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl +#DOCBOOK_MAN_XSL=%%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl DOCBOOK_MAN_XSL=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl -#DOCBOOK_XHTML_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl +#DOCBOOK_XHTML_XSL=%%LOCALBASE%%/share/xsl/docbook/xhtml/chunk.xsl DOCBOOK_XHTML_XSL=http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl -#DOCBOOK_DTD=/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd +#DOCBOOK_DTD=%%LOCALBASE%%/share/xml/docbook/4.5/docbookx.dtd DOCBOOK_DTD=http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd # BUILD : options to compile with netpbm / opencv libraries GCC_NETPBM=-lnetpbm -GCC_OPENCV=-I /usr/include/opencv +GCC_OPENCV=-I %%LOCALBASE%%/include/opencv GCC_OPENCV_LIBS=auto # INFO IN DESKTOP FILE -@@ -86,6 +95,6 @@ +@@ -85,7 +94,7 @@ + # INSTALL USER AND GROUP ifneq ($(SYSTEM_TYPE),rpm) - INSTALL_USER=root +-INSTALL_USER=root -INSTALL_GROUP=root -+INSTALL_GROUP=wheel ++INSTALL_USER= ++INSTALL_GROUP= endif Index: head/misc/auto-multiple-choice/pkg-plist =================================================================== --- head/misc/auto-multiple-choice/pkg-plist (revision 371412) +++ head/misc/auto-multiple-choice/pkg-plist (revision 371413) @@ -1,187 +1,160 @@ bin/auto-multiple-choice lib/AMC/exec/AMC-detect lib/AMC/exec/AMC-traitement-image lib/AMC/perl/AMC-analyse.pl lib/AMC/perl/AMC-annote.pl lib/AMC/perl/AMC-association-auto.pl lib/AMC/perl/AMC-association.pl lib/AMC/perl/AMC-export.pl lib/AMC/perl/AMC-getimages.pl lib/AMC/perl/AMC-gui-apropos.glade lib/AMC/perl/AMC-gui-choix_pages_impression.glade lib/AMC/perl/AMC-gui-choix_postcorrect.glade lib/AMC/perl/AMC-gui-choix_projet.glade lib/AMC/perl/AMC-gui-choose-mode.glade lib/AMC/perl/AMC-gui-choose_columns.glade lib/AMC/perl/AMC-gui-choose_students.glade lib/AMC/perl/AMC-gui-cleanup.glade lib/AMC/perl/AMC-gui-edit_preferences.glade lib/AMC/perl/AMC-gui-filter_details.glade lib/AMC/perl/AMC-gui-liste_dialog.glade lib/AMC/perl/AMC-gui-mailing.glade lib/AMC/perl/AMC-gui-main_window.glade lib/AMC/perl/AMC-gui-make_template.glade lib/AMC/perl/AMC-gui-saisie_auto.glade lib/AMC/perl/AMC-gui-source_latex_choix.glade lib/AMC/perl/AMC-gui-source_latex_choix_zip.glade lib/AMC/perl/AMC-gui-source_latex_dialog.glade lib/AMC/perl/AMC-gui-source_latex_modele.glade lib/AMC/perl/AMC-gui-unrecognized.glade lib/AMC/perl/AMC-gui.pl lib/AMC/perl/AMC-imprime.pl lib/AMC/perl/AMC-latex-link.pl lib/AMC/perl/AMC-mailing.pl lib/AMC/perl/AMC-manuel.pl 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/Basic.pm %%SITE_PERL%%/AMC/Boite.pm %%SITE_PERL%%/AMC/Calage.pm %%SITE_PERL%%/AMC/Data.pm %%SITE_PERL%%/AMC/DataModule.pm %%SITE_PERL%%/AMC/DataModule/association.pm %%SITE_PERL%%/AMC/DataModule/capture.pm %%SITE_PERL%%/AMC/DataModule/layout.pm %%SITE_PERL%%/AMC/DataModule/report.pm %%SITE_PERL%%/AMC/DataModule/scoring.pm %%SITE_PERL%%/AMC/Exec.pm %%SITE_PERL%%/AMC/Export.pm %%SITE_PERL%%/AMC/Export/CSV.pm %%SITE_PERL%%/AMC/Export/List.pm %%SITE_PERL%%/AMC/Export/ods.pm %%SITE_PERL%%/AMC/Export/register.pm %%SITE_PERL%%/AMC/Export/register/CSV.pm %%SITE_PERL%%/AMC/Export/register/List.pm %%SITE_PERL%%/AMC/Export/register/ods.pm %%SITE_PERL%%/AMC/FileMonitor.pm %%SITE_PERL%%/AMC/Filter.pm %%SITE_PERL%%/AMC/Filter/latex.pm %%SITE_PERL%%/AMC/Filter/plain.pm %%SITE_PERL%%/AMC/Filter/register.pm %%SITE_PERL%%/AMC/Filter/register/latex.pm %%SITE_PERL%%/AMC/Filter/register/plain.pm %%SITE_PERL%%/AMC/Gui/Association.glade %%SITE_PERL%%/AMC/Gui/Association.pm %%SITE_PERL%%/AMC/Gui/Avancement.pm %%SITE_PERL%%/AMC/Gui/Commande.pm %%SITE_PERL%%/AMC/Gui/Manuel.glade %%SITE_PERL%%/AMC/Gui/Manuel.pm %%SITE_PERL%%/AMC/Gui/Notes.glade %%SITE_PERL%%/AMC/Gui/Notes.pm %%SITE_PERL%%/AMC/Gui/PageArea.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/Queue.pm %%SITE_PERL%%/AMC/Scoring.pm %%SITE_PERL%%/AMC/ScoringEnv.pm %%SITE_PERL%%/AMC/State.pm %%SITE_PERL%%/AMC/Substitute.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-association-auto.1.gz man/ja/man1/AMC-association.1.gz man/ja/man1/AMC-export.1.gz man/ja/man1/AMC-getimages.1.gz man/ja/man1/AMC-imprime.1.gz 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-association-auto.1.gz man/man1/AMC-association.1.gz man/man1/AMC-export.1.gz man/man1/AMC-getimages.1.gz man/man1/AMC-imprime.1.gz 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 %%DATADIR%%/icons/amc-auto-assoc.svg %%DATADIR%%/icons/amc-auto-capture.svg %%DATADIR%%/icons/amc-group.svg %%DATADIR%%/icons/amc-manual-assoc.svg %%DATADIR%%/icons/amc-manual-capture.svg %%DATADIR%%/icons/amc-mark.svg %%DATADIR%%/icons/amc-send.svg %%DATADIR%%/icons/auto-multiple-choice.svg %%DATADIR%%/models/ar/directory.xml %%DATADIR%%/models/ar/groups.tgz %%DATADIR%%/models/ar/scoring.tgz %%DATADIR%%/models/ar/separate.tgz %%DATADIR%%/models/ar/simple.tgz %%DATADIR%%/models/en/directory.xml %%DATADIR%%/models/en/groups.tgz %%DATADIR%%/models/en/scoring.tgz %%DATADIR%%/models/en/separate.tgz %%DATADIR%%/models/en/simple-txt.tgz %%DATADIR%%/models/en/simple.tgz %%DATADIR%%/models/fr/bareme.tgz %%DATADIR%%/models/fr/directory.xml %%DATADIR%%/models/fr/ensemble.tgz %%DATADIR%%/models/fr/groupes.tgz %%DATADIR%%/models/fr/simple-txt.tgz %%DATADIR%%/models/fr/simple.tgz %%DATADIR%%/models/ja/directory.xml %%DATADIR%%/models/ja/groups.tgz %%DATADIR%%/models/ja/scoring.tgz %%DATADIR%%/models/ja/separate.tgz %%DATADIR%%/models/ja/simple-txt.tgz %%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/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 share/mime/packages/auto-multiple-choice.xml share/pixmaps/auto-multiple-choice.xpm %%TEXMFLOCALDIR%%/doc/latex/AMC/automultiplechoice.pdf %%TEXMFLOCALDIR%%/doc/latex/AMC/questions.tex %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-amc.pdf %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-amc.tex %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-plain.pdf %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-plain.tex %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-separate.pdf %%TEXMFLOCALDIR%%/doc/latex/AMC/sample-separate.tex %%TEXMFLOCALDIR%%/tex/latex/AMC/automultiplechoice.sty -@dirrm lib/AMC/exec -@dirrm lib/AMC/perl -@dirrm lib/AMC -@dirrm %%SITE_PERL%%/AMC/DataModule -@dirrm %%SITE_PERL%%/AMC/Export/register -@dirrm %%SITE_PERL%%/AMC/Export -@dirrm %%SITE_PERL%%/AMC/Filter/register -@dirrm %%SITE_PERL%%/AMC/Filter -@dirrm %%SITE_PERL%%/AMC/Gui -@dirrm %%SITE_PERL%%/AMC -@dirrmtry man/fr/man1 -@dirrmtry man/fr -@dirrm %%DATADIR%%/icons -@dirrm %%DATADIR%%/models/ar -@dirrm %%DATADIR%%/models/en -@dirrm %%DATADIR%%/models/fr -@dirrm %%DATADIR%%/models/ja -@dirrm %%DATADIR%%/models -@dirrm %%DATADIR%% -@dirrmtry share/gtksourceview-2.0/language-specs -@dirrmtry share/gtksourceview-2.0 -@dirrm %%TEXMFLOCALDIR%%/doc/latex/AMC -@dirrmtry %%TEXMFLOCALDIR%%/doc/latex -@dirrmtry %%TEXMFLOCALDIR%%/doc -@dirrm %%TEXMFLOCALDIR%%/tex/latex/AMC -@dirrmtry %%TEXMFLOCALDIR%%/tex/latex -@dirrmtry %%TEXMFLOCALDIR%%/tex