Attachment #138763 for bug #184846

View | Details | Raw Unified | Return to bug 184846
Collapse All | Expand All




# $FreeBSD: head/science/avogadro/Makefile 336262 2013-12-12 14:15:03Z bapt $

PORTNAME=	avogadro
PORTVERSION=	1.1.1
PORTREVISION=	1
CATEGORIES=	science
MASTER_SITES=	SF



LICENSE=	GPLv2 # (or later)

BUILD_DEPENDS=	eigen2>2:${PORTSDIR}/math/eigen2
LIB_DEPENDS=	libopenbabel.so:${PORTSDIR}/science/openbabel

OPTIONS_DEFINE=	PYTHON
OPTIONS_DEFAULT=PYTHON
OPTIONS_SUB=	yes

USE_BZIP2=	yes
USES=		cmake desktop-file-utils pkgconfig
USE_GL=		glu
USE_QT4=	gui network opengl \
		linguist_build moc_build qmake_build rcc_build uic_build

		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
USE_LDCONFIG=	yes

CFLAGS+=	-idirafter ${LOCALBASE}/include/eigen2 \
		-idirafter ${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

MAN1=		avogadro.1 avopkg.1

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MPYTHON}
USE_PYTHON=	2
USE_PYTHON=	-2.7
BUILD_DEPENDS+=	${PYNUMPY} \
		${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
RUN_DEPENDS+=	${PYNUMPY} \
		${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
CMAKE_ARGS+=	-DENABLE_PYTHON=ON \
		-DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
.else
CMAKE_ARGS+=	-DENABLE_PYTHON=OFF
PLIST_SUB+=	PYTHON="@comment "
.endif

post-patch:

	@${REINPLACE_CMD} -e \
		's|share/man|man|' ${WRKSRC}/doc/CMakeLists.txt

pre-configure:
.if ${PORT_OPTIONS:MPYTHON}
	@${MKDIR} ${WRKDIR}/include/${PYTHON_VERSION}
	@${FIND} ${PYTHON_INCLUDEDIR} ! -name "pyport.h" -type f \
		-maxdepth 1 | ${XARGS} -J % ${LN} -sf % \
		${WRKDIR}/include/${PYTHON_VERSION}
	@${SED} -e 's|^#ifdef _PY_PORT_CTYPE_UTF8_ISSUE|#if 0|' \
		${PYTHON_INCLUDEDIR}/pyport.h > \
		${WRKDIR}/include/${PYTHON_VERSION}/pyport.h
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)science/avogadro/distinfo (-2 / +2 lines)
1	SHA256 (avogadro-1.1.0.tar.bz2) = 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0	1	SHA256 (avogadro-1.1.1.tar.bz2) = fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14
2	SIZE (avogadro-1.1.0.tar.bz2) = 10741835	2	SIZE (avogadro-1.1.1.tar.bz2) = 11118046




From f518cdf4d281ac6da124b179a7f9b4b71ca90cb0 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 14 May 2013 23:03:57 +0300
Subject: [PATCH] Treat "amd64" as a possible value for CMAKE_SYSTEM_PROCESSOR.

The BSDs (and maybe OS X) report 64-bits sytems as "amd64" instead of
"x86_64", so accept that value when deciding whether to pass -fPIC to the
compiler too.
---
 libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
 libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
index fb88316..8ee7d71 100644
--- ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
+++ ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
 set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
 
 # Set -fPIC on x86_64
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
 endif()
diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
index 0cd0c3e..62adfe3 100644
--- ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
+++ ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
 set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
 
 # Set -fPIC on x86_64
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC"  )
 endif()
-- 
1.8.2.3





include/avogadro/zmatrix.h
lib/avogadro/1_1/AvogadroUse.cmake
lib/avogadro/1_1/cmake/FindEigen2.cmake
lib/avogadro/1_1/cmake/FindEigen3.cmake
lib/avogadro/1_1/cmake/FindGLEW.cmake
lib/avogadro/1_1/colors/atomindexcolor.so
lib/avogadro/1_1/colors/chargecolor.so

lib/avogadro/1_1/extensions/h2methylextension.so
lib/avogadro/1_1/extensions/hydrogensextension.so
lib/avogadro/1_1/extensions/inputfileextension.so
lib/avogadro/1_1/extensions/insertdnaextension.so
lib/avogadro/1_1/extensions/insertfragmentextension.so
lib/avogadro/1_1/extensions/insertpeptideextension.so
lib/avogadro/1_1/extensions/invertchiralextension.so

lib/avogadro/AvogadroTargets.cmake
lib/libavogadro.so
lib/libavogadro.so.1
lib/libavogadro.so.1.1.1
lib/libavogadro_OpenQube.so
lib/libavogadro_OpenQube.so.0
lib/libavogadro_OpenQube.so.0.1.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so
libdata/pkgconfig/avogadro.pc
man/man1/avogadro.1.gz
man/man1/avopkg.1.gz
share/applications/avogadro.desktop
%%DATADIR%%/builder/amino/d-ala.zmat
%%DATADIR%%/builder/amino/d-arg.zmat

%%DATADIR%%/i18n/avogadro_en_CA.qm
%%DATADIR%%/i18n/avogadro_en_GB.qm
%%DATADIR%%/i18n/avogadro_es.qm
%%DATADIR%%/i18n/avogadro_et.qm
%%DATADIR%%/i18n/avogadro_eu.qm
%%DATADIR%%/i18n/avogadro_fi.qm
%%DATADIR%%/i18n/avogadro_fr.qm
%%DATADIR%%/i18n/avogadro_gl.qm
%%DATADIR%%/i18n/avogadro_he.qm
%%DATADIR%%/i18n/avogadro_hi.qm
%%DATADIR%%/i18n/avogadro_hr.qm
%%DATADIR%%/i18n/avogadro_hu.qm
%%DATADIR%%/i18n/avogadro_id.qm

%%DATADIR%%/i18n/avogadro_ja.qm
%%DATADIR%%/i18n/avogadro_kn.qm
%%DATADIR%%/i18n/avogadro_ko.qm
%%DATADIR%%/i18n/avogadro_ms.qm
%%DATADIR%%/i18n/avogadro_nb.qm
%%DATADIR%%/i18n/avogadro_nl.qm
%%DATADIR%%/i18n/avogadro_oc.qm

%%DATADIR%%/i18n/avogadro_pt_BR.qm
%%DATADIR%%/i18n/avogadro_ru.qm
%%DATADIR%%/i18n/avogadro_sk.qm
%%DATADIR%%/i18n/avogadro_sl.qm
%%DATADIR%%/i18n/avogadro_sq.qm
%%DATADIR%%/i18n/avogadro_sr.qm
%%DATADIR%%/i18n/avogadro_sv.qm
%%DATADIR%%/i18n/avogadro_ta.qm
%%DATADIR%%/i18n/avogadro_th.qm
%%DATADIR%%/i18n/avogadro_tr.qm
%%DATADIR%%/i18n/avogadro_ug.qm

%%DATADIR%%/i18n/libavogadro_en_CA.qm
%%DATADIR%%/i18n/libavogadro_en_GB.qm
%%DATADIR%%/i18n/libavogadro_es.qm
%%DATADIR%%/i18n/libavogadro_et.qm
%%DATADIR%%/i18n/libavogadro_eu.qm
%%DATADIR%%/i18n/libavogadro_fi.qm
%%DATADIR%%/i18n/libavogadro_fr.qm

%%DATADIR%%/i18n/libavogadro_ja.qm
%%DATADIR%%/i18n/libavogadro_kn.qm
%%DATADIR%%/i18n/libavogadro_ko.qm
%%DATADIR%%/i18n/libavogadro_ms.qm
%%DATADIR%%/i18n/libavogadro_nb.qm
%%DATADIR%%/i18n/libavogadro_nl.qm
%%DATADIR%%/i18n/libavogadro_oc.qm

%%DATADIR%%/i18n/libavogadro_pt_BR.qm
%%DATADIR%%/i18n/libavogadro_ru.qm
%%DATADIR%%/i18n/libavogadro_sk.qm
%%DATADIR%%/i18n/libavogadro_sl.qm
%%DATADIR%%/i18n/libavogadro_sq.qm
%%DATADIR%%/i18n/libavogadro_sr.qm
%%DATADIR%%/i18n/libavogadro_sv.qm
%%DATADIR%%/i18n/libavogadro_tr.qm

Return to bug 184846

Lines 2-9 Link Here

(-)science/avogadro/Makefile (-12 / +20 lines)
2	# $FreeBSD: head/science/avogadro/Makefile 336262 2013-12-12 14:15:03Z bapt $	2	# $FreeBSD: head/science/avogadro/Makefile 336262 2013-12-12 14:15:03Z bapt $
3		3
4	PORTNAME= avogadro	4	PORTNAME= avogadro
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.1.1
6	PORTREVISION= 1
7	CATEGORIES= science	6	CATEGORIES= science
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 12-25 Link Here
12		11
13	LICENSE= GPLv2 # (or later)	12	LICENSE= GPLv2 # (or later)
14		13
15	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2	14	BUILD_DEPENDS= eigen2>2:${PORTSDIR}/math/eigen2
16	LIB_DEPENDS= libopenbabel.so:${PORTSDIR}/science/openbabel	15	LIB_DEPENDS= libopenbabel.so:${PORTSDIR}/science/openbabel
17		16
18	OPTIONS_DEFINE= PYTHON	17	OPTIONS_DEFINE= PYTHON
19	OPTIONS_DEFAULT=PYTHON	18	OPTIONS_DEFAULT=PYTHON
		19	OPTIONS_SUB= yes
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USES= cmake pkgconfig	22	USES= cmake desktop-file-utils pkgconfig
23	USE_GL= glu	23	USE_GL= glu
24	USE_QT4= gui network opengl \	24	USE_QT4= gui network opengl \
25	linguist_build moc_build qmake_build rcc_build uic_build	25	linguist_build moc_build qmake_build rcc_build uic_build
Lines 27-52 Link Here
27	-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs	27	-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29		29
30	CFLAGS+= -idirafter ${LOCALBASE}/include	30	CFLAGS+= -idirafter ${LOCALBASE}/include/eigen2 \
		31	-idirafter ${LOCALBASE}/include
31	LDFLAGS+= -L${LOCALBASE}/lib	32	LDFLAGS+= -L${LOCALBASE}/lib
32		33
33	MAN1= avogadro.1 avopkg.1
34
35	NO_STAGE= yes
36	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
37		35
38	.if ${PORT_OPTIONS:MPYTHON}	36	.if ${PORT_OPTIONS:MPYTHON}
39	CMAKE_ARGS+= -DENABLE_PYTHON=ON	37	USE_PYTHON= 2
40	USE_PYTHON= -2.7
41	BUILD_DEPENDS+= ${PYNUMPY} \	38	BUILD_DEPENDS+= ${PYNUMPY} \
42	${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip	39	${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
43	LIB_DEPENDS+= libboost_python.so:${PORTSDIR}/devel/boost-python-libs	40	LIB_DEPENDS+= libboost_python.so:${PORTSDIR}/devel/boost-python-libs
44	RUN_DEPENDS+= ${PYNUMPY} \	41	RUN_DEPENDS+= ${PYNUMPY} \
45	${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip	42	${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
46	PLIST_SUB+= PYTHON=""	43	CMAKE_ARGS+= -DENABLE_PYTHON=ON \
		44	-DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
47	.else	45	.else
48	CMAKE_ARGS+= -DENABLE_PYTHON=OFF	46	CMAKE_ARGS+= -DENABLE_PYTHON=OFF
49	PLIST_SUB+= PYTHON="@comment "
50	.endif	47	.endif
51		48
52	post-patch:	49	post-patch:
Lines 56-59 Link Here
56	@${REINPLACE_CMD} -e \	53	@${REINPLACE_CMD} -e \
57	's\|share/man\|man\|' ${WRKSRC}/doc/CMakeLists.txt	54	's\|share/man\|man\|' ${WRKSRC}/doc/CMakeLists.txt
58		55
		56	pre-configure:
		57	.if ${PORT_OPTIONS:MPYTHON}
		58	@${MKDIR} ${WRKDIR}/include/${PYTHON_VERSION}
		59	@${FIND} ${PYTHON_INCLUDEDIR} ! -name "pyport.h" -type f \
		60	-maxdepth 1 \| ${XARGS} -J % ${LN} -sf % \
		61	${WRKDIR}/include/${PYTHON_VERSION}
		62	@${SED} -e 's\|^#ifdef _PY_PORT_CTYPE_UTF8_ISSUE\|#if 0\|' \
		63	${PYTHON_INCLUDEDIR}/pyport.h > \
		64	${WRKDIR}/include/${PYTHON_VERSION}/pyport.h
		65	.endif
		66
59	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-41 Link Here

(-)science/avogadro/files/patch-git_f518cdf4d281ac6da124b179a7f9b4b71ca90cb0 (-41 lines)
1	From f518cdf4d281ac6da124b179a7f9b4b71ca90cb0 Mon Sep 17 00:00:00 2001
2	From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
3	Date: Tue, 14 May 2013 23:03:57 +0300
4	Subject: [PATCH] Treat "amd64" as a possible value for CMAKE_SYSTEM_PROCESSOR.
5
6	The BSDs (and maybe OS X) report 64-bits sytems as "amd64" instead of
7	"x86_64", so accept that value when deciding whether to pass -fPIC to the
8	compiler too.
9	---
10	libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt \| 2 +-
11	libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt \| 2 +-
12	2 files changed, 2 insertions(+), 2 deletions(-)
13
14	diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
15	index fb88316..8ee7d71 100644
16	--- ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
17	+++ ./libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
18	@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
19	set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
20
21	# Set -fPIC on x86_64
22	-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
23	+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
24	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
25	endif()
26	diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
27	index 0cd0c3e..62adfe3 100644
28	--- ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
29	+++ ./libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
30	@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
31	set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
32
33	# Set -fPIC on x86_64
34	-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
35	+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64")
36	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
37	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
38	endif()
39	--
40	1.8.2.3
41

Lines 48-53 Link Here

(-)science/avogadro/pkg-plist (-1 / +15 lines)
48	include/avogadro/zmatrix.h	48	include/avogadro/zmatrix.h
49	lib/avogadro/1_1/AvogadroUse.cmake	49	lib/avogadro/1_1/AvogadroUse.cmake
50	lib/avogadro/1_1/cmake/FindEigen2.cmake	50	lib/avogadro/1_1/cmake/FindEigen2.cmake
		51	lib/avogadro/1_1/cmake/FindEigen3.cmake
51	lib/avogadro/1_1/cmake/FindGLEW.cmake	52	lib/avogadro/1_1/cmake/FindGLEW.cmake
52	lib/avogadro/1_1/colors/atomindexcolor.so	53	lib/avogadro/1_1/colors/atomindexcolor.so
53	lib/avogadro/1_1/colors/chargecolor.so	54	lib/avogadro/1_1/colors/chargecolor.so
Lines 80-85 Link Here
80	lib/avogadro/1_1/extensions/h2methylextension.so	81	lib/avogadro/1_1/extensions/h2methylextension.so
81	lib/avogadro/1_1/extensions/hydrogensextension.so	82	lib/avogadro/1_1/extensions/hydrogensextension.so
82	lib/avogadro/1_1/extensions/inputfileextension.so	83	lib/avogadro/1_1/extensions/inputfileextension.so
		84	lib/avogadro/1_1/extensions/insertdnaextension.so
83	lib/avogadro/1_1/extensions/insertfragmentextension.so	85	lib/avogadro/1_1/extensions/insertfragmentextension.so
84	lib/avogadro/1_1/extensions/insertpeptideextension.so	86	lib/avogadro/1_1/extensions/insertpeptideextension.so
85	lib/avogadro/1_1/extensions/invertchiralextension.so	87	lib/avogadro/1_1/extensions/invertchiralextension.so
Lines 110-121 Link Here
110	lib/avogadro/AvogadroTargets.cmake	112	lib/avogadro/AvogadroTargets.cmake
111	lib/libavogadro.so	113	lib/libavogadro.so
112	lib/libavogadro.so.1	114	lib/libavogadro.so.1
113	lib/libavogadro.so.1.1.0	115	lib/libavogadro.so.1.1.1
114	lib/libavogadro_OpenQube.so	116	lib/libavogadro_OpenQube.so
115	lib/libavogadro_OpenQube.so.0	117	lib/libavogadro_OpenQube.so.0
116	lib/libavogadro_OpenQube.so.0.1.0	118	lib/libavogadro_OpenQube.so.0.1.0
117	%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so	119	%%PYTHON%%%%PYTHON_SITELIBDIR%%/Avogadro.so
118	libdata/pkgconfig/avogadro.pc	120	libdata/pkgconfig/avogadro.pc
		121	man/man1/avogadro.1.gz
		122	man/man1/avopkg.1.gz
119	share/applications/avogadro.desktop	123	share/applications/avogadro.desktop
120	%%DATADIR%%/builder/amino/d-ala.zmat	124	%%DATADIR%%/builder/amino/d-ala.zmat
121	%%DATADIR%%/builder/amino/d-arg.zmat	125	%%DATADIR%%/builder/amino/d-arg.zmat
Lines 1060-1070 Link Here
1060	%%DATADIR%%/i18n/avogadro_en_CA.qm	1064	%%DATADIR%%/i18n/avogadro_en_CA.qm
1061	%%DATADIR%%/i18n/avogadro_en_GB.qm	1065	%%DATADIR%%/i18n/avogadro_en_GB.qm
1062	%%DATADIR%%/i18n/avogadro_es.qm	1066	%%DATADIR%%/i18n/avogadro_es.qm
		1067	%%DATADIR%%/i18n/avogadro_et.qm
1063	%%DATADIR%%/i18n/avogadro_eu.qm	1068	%%DATADIR%%/i18n/avogadro_eu.qm
1064	%%DATADIR%%/i18n/avogadro_fi.qm	1069	%%DATADIR%%/i18n/avogadro_fi.qm
1065	%%DATADIR%%/i18n/avogadro_fr.qm	1070	%%DATADIR%%/i18n/avogadro_fr.qm
1066	%%DATADIR%%/i18n/avogadro_gl.qm	1071	%%DATADIR%%/i18n/avogadro_gl.qm
1067	%%DATADIR%%/i18n/avogadro_he.qm	1072	%%DATADIR%%/i18n/avogadro_he.qm
		1073	%%DATADIR%%/i18n/avogadro_hi.qm
1068	%%DATADIR%%/i18n/avogadro_hr.qm	1074	%%DATADIR%%/i18n/avogadro_hr.qm
1069	%%DATADIR%%/i18n/avogadro_hu.qm	1075	%%DATADIR%%/i18n/avogadro_hu.qm
1070	%%DATADIR%%/i18n/avogadro_id.qm	1076	%%DATADIR%%/i18n/avogadro_id.qm
Lines 1072-1077 Link Here
1072	%%DATADIR%%/i18n/avogadro_ja.qm	1078	%%DATADIR%%/i18n/avogadro_ja.qm
1073	%%DATADIR%%/i18n/avogadro_kn.qm	1079	%%DATADIR%%/i18n/avogadro_kn.qm
1074	%%DATADIR%%/i18n/avogadro_ko.qm	1080	%%DATADIR%%/i18n/avogadro_ko.qm
		1081	%%DATADIR%%/i18n/avogadro_ms.qm
1075	%%DATADIR%%/i18n/avogadro_nb.qm	1082	%%DATADIR%%/i18n/avogadro_nb.qm
1076	%%DATADIR%%/i18n/avogadro_nl.qm	1083	%%DATADIR%%/i18n/avogadro_nl.qm
1077	%%DATADIR%%/i18n/avogadro_oc.qm	1084	%%DATADIR%%/i18n/avogadro_oc.qm
Lines 1080-1087 Link Here
1080	%%DATADIR%%/i18n/avogadro_pt_BR.qm	1087	%%DATADIR%%/i18n/avogadro_pt_BR.qm
1081	%%DATADIR%%/i18n/avogadro_ru.qm	1088	%%DATADIR%%/i18n/avogadro_ru.qm
1082	%%DATADIR%%/i18n/avogadro_sk.qm	1089	%%DATADIR%%/i18n/avogadro_sk.qm
		1090	%%DATADIR%%/i18n/avogadro_sl.qm
		1091	%%DATADIR%%/i18n/avogadro_sq.qm
1083	%%DATADIR%%/i18n/avogadro_sr.qm	1092	%%DATADIR%%/i18n/avogadro_sr.qm
1084	%%DATADIR%%/i18n/avogadro_sv.qm	1093	%%DATADIR%%/i18n/avogadro_sv.qm
		1094	%%DATADIR%%/i18n/avogadro_ta.qm
1085	%%DATADIR%%/i18n/avogadro_th.qm	1095	%%DATADIR%%/i18n/avogadro_th.qm
1086	%%DATADIR%%/i18n/avogadro_tr.qm	1096	%%DATADIR%%/i18n/avogadro_tr.qm
1087	%%DATADIR%%/i18n/avogadro_ug.qm	1097	%%DATADIR%%/i18n/avogadro_ug.qm
Lines 1102-1107 Link Here
1102	%%DATADIR%%/i18n/libavogadro_en_CA.qm	1112	%%DATADIR%%/i18n/libavogadro_en_CA.qm
1103	%%DATADIR%%/i18n/libavogadro_en_GB.qm	1113	%%DATADIR%%/i18n/libavogadro_en_GB.qm
1104	%%DATADIR%%/i18n/libavogadro_es.qm	1114	%%DATADIR%%/i18n/libavogadro_es.qm
		1115	%%DATADIR%%/i18n/libavogadro_et.qm
1105	%%DATADIR%%/i18n/libavogadro_eu.qm	1116	%%DATADIR%%/i18n/libavogadro_eu.qm
1106	%%DATADIR%%/i18n/libavogadro_fi.qm	1117	%%DATADIR%%/i18n/libavogadro_fi.qm
1107	%%DATADIR%%/i18n/libavogadro_fr.qm	1118	%%DATADIR%%/i18n/libavogadro_fr.qm
Lines 1114-1119 Link Here
1114	%%DATADIR%%/i18n/libavogadro_ja.qm	1125	%%DATADIR%%/i18n/libavogadro_ja.qm
1115	%%DATADIR%%/i18n/libavogadro_kn.qm	1126	%%DATADIR%%/i18n/libavogadro_kn.qm
1116	%%DATADIR%%/i18n/libavogadro_ko.qm	1127	%%DATADIR%%/i18n/libavogadro_ko.qm
		1128	%%DATADIR%%/i18n/libavogadro_ms.qm
1117	%%DATADIR%%/i18n/libavogadro_nb.qm	1129	%%DATADIR%%/i18n/libavogadro_nb.qm
1118	%%DATADIR%%/i18n/libavogadro_nl.qm	1130	%%DATADIR%%/i18n/libavogadro_nl.qm
1119	%%DATADIR%%/i18n/libavogadro_oc.qm	1131	%%DATADIR%%/i18n/libavogadro_oc.qm
Lines 1122-1127 Link Here
1122	%%DATADIR%%/i18n/libavogadro_pt_BR.qm	1134	%%DATADIR%%/i18n/libavogadro_pt_BR.qm
1123	%%DATADIR%%/i18n/libavogadro_ru.qm	1135	%%DATADIR%%/i18n/libavogadro_ru.qm
1124	%%DATADIR%%/i18n/libavogadro_sk.qm	1136	%%DATADIR%%/i18n/libavogadro_sk.qm
		1137	%%DATADIR%%/i18n/libavogadro_sl.qm
		1138	%%DATADIR%%/i18n/libavogadro_sq.qm
1125	%%DATADIR%%/i18n/libavogadro_sr.qm	1139	%%DATADIR%%/i18n/libavogadro_sr.qm
1126	%%DATADIR%%/i18n/libavogadro_sv.qm	1140	%%DATADIR%%/i18n/libavogadro_sv.qm
1127	%%DATADIR%%/i18n/libavogadro_tr.qm	1141	%%DATADIR%%/i18n/libavogadro_tr.qm