aboutsummaryrefslogtreecommitdiff
path: root/science/gchemutils
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-01-27 19:40:17 +0000
committerRene Ladan <rene@FreeBSD.org>2020-01-27 19:40:17 +0000
commitb0eec09651960d8c9d8a0981beab512bfb3c21f7 (patch)
tree94e26138c8267621b1b647591febb9f4c2bee2eb /science/gchemutils
parent56b735e2588de9f5ab64b0122de9f731ea768c0c (diff)
downloadports-b0eec09651960d8c9d8a0981beab512bfb3c21f7.tar.gz
ports-b0eec09651960d8c9d8a0981beab512bfb3c21f7.zip
Remove textproc/gnome-doc-utils.
It is abandonded upstream for years and is Python-2.7-only. Adjust consumers, some only need a rebuild, others have their documentation formerly created by gnome-doc-utils / xml2po removed. Remove gnomedocutils from USE_GNOME Submitted by: rene Approved by: portmgr (mat), gnome (kwm) Differential Revision: https://reviews.freebsd.org/D23381
Notes
Notes: svn path=/head/; revision=524409
Diffstat (limited to 'science/gchemutils')
-rw-r--r--science/gchemutils/Makefile4
-rw-r--r--science/gchemutils/files/patch-Makefile.in6
-rw-r--r--science/gchemutils/files/patch-configure62
-rw-r--r--science/gchemutils/files/patch-docs_Makefile.in11
-rw-r--r--science/gchemutils/files/patch-libs_gcr_document.cc10
-rw-r--r--science/gchemutils/files/patch-libs_gcu_spacegroup.cc8
-rw-r--r--science/gchemutils/pkg-plist163
7 files changed, 87 insertions, 177 deletions
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 6e1fedd92ab3..50b744f967b1 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.14.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTVERSION:R}
DISTNAME= gnome-chemistry-utils-${PORTVERSION}
@@ -28,7 +28,7 @@ USES= compiler:c++11-lang desktop-file-utils gettext gl gmake gnome \
libtool:keepla localbase:ldflags pathfix pkgconfig \
shared-mime-info tar:xz xorg
USE_XORG= x11
-USE_GNOME= cairo gnomedocutils gtk30 intlhack libgsf libxml2
+USE_GNOME= cairo gtk30 intlhack libgsf libxml2
USE_GL= gl
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/science/gchemutils/files/patch-Makefile.in b/science/gchemutils/files/patch-Makefile.in
index 1bd691a6548d..e9c123a888f0 100644
--- a/science/gchemutils/files/patch-Makefile.in
+++ b/science/gchemutils/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2014-03-10 23:12:16.000000000 +0100
-+++ Makefile.in 2014-03-10 23:14:08.000000000 +0100
-@@ -927,7 +927,6 @@
+--- Makefile.in.orig 2020-01-19 23:15:40 UTC
++++ Makefile.in
+@@ -944,7 +944,6 @@ info-am:
install-data-am: install-mimeDATA
@$(NORMAL_INSTALL)
diff --git a/science/gchemutils/files/patch-configure b/science/gchemutils/files/patch-configure
new file mode 100644
index 000000000000..015a7a17dd6e
--- /dev/null
+++ b/science/gchemutils/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig 2020-01-19 23:15:40 UTC
++++ configure
+@@ -17046,33 +17046,9 @@ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -17112,25 +17088,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/science/gchemutils/files/patch-docs_Makefile.in b/science/gchemutils/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..334152997613
--- /dev/null
+++ b/science/gchemutils/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig 2016-11-23 13:06:30 UTC
++++ docs/Makefile.in
+@@ -400,7 +400,7 @@ x11_CFLAGS = @x11_CFLAGS@
+ x11_LIBS = @x11_LIBS@
+ xml_CFLAGS = @xml_CFLAGS@
+ xml_LIBS = @xml_LIBS@
+-SUBDIRS = help man reference
++SUBDIRS = man reference
+ MAINTAINERCLEANFILES = Makefile.in
+ all: all-recursive
+
diff --git a/science/gchemutils/files/patch-libs_gcr_document.cc b/science/gchemutils/files/patch-libs_gcr_document.cc
index 5ededb3e9b8d..e18f6a6d40d2 100644
--- a/science/gchemutils/files/patch-libs_gcr_document.cc
+++ b/science/gchemutils/files/patch-libs_gcr_document.cc
@@ -1,10 +1,10 @@
---- libs/gcr/document.cc.orig 2013-12-03 21:16:21.000000000 +0100
-+++ libs/gcr/document.cc 2013-12-03 21:22:51.000000000 +0100
-@@ -1521,7 +1521,6 @@
+--- libs/gcr/document.cc.orig 2016-11-23 13:05:34 UTC
++++ libs/gcr/document.cc
+@@ -1794,7 +1794,6 @@ void Document::Save() const
if (error) {
- cerr << "gio error: " << error->message << endl;
+ g_message ("GIO error: %s", error->message);
g_error_free (error);
- g_object_unref (file);
throw (int) 1;
}
- std::map<std::string, sAtom>AtomsMap;
+ buf->context = output;
diff --git a/science/gchemutils/files/patch-libs_gcu_spacegroup.cc b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
index 6bd3a6d1d989..0fc235dd8302 100644
--- a/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
+++ b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
@@ -1,6 +1,6 @@
---- libs/gcu/spacegroup.cc.orig 2018-05-20 17:09:17.854019000 +0200
-+++ libs/gcu/spacegroup.cc 2018-05-20 17:22:26.142391000 +0200
-@@ -340,7 +340,7 @@
+--- libs/gcu/spacegroup.cc.orig 2016-11-23 13:05:34 UTC
++++ libs/gcu/spacegroup.cc
+@@ -340,7 +340,7 @@ list<Vector> SpaceGroup::Transform (const Vector &v) c
Transform3d const * SpaceGroup::GetFirstTransform (list <Transform3d*>::const_iterator &i) const
{
i = m_Transforms.begin ();
@@ -9,7 +9,7 @@
}
/*!
-@@ -348,7 +348,7 @@
+@@ -348,7 +348,7 @@ Transform3d const * SpaceGroup::GetFirstTransform (lis
Transform3d const * SpaceGroup::GetNextTransform (list <Transform3d*>::const_iterator &i) const
{
i++;
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index f912e3aa5f06..ffedd4dfb450 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -149,169 +149,6 @@ share/gchemutils/%%VER%%/pixmaps/gcrystal_logo.png
share/gchemutils/%%VER%%/pixmaps/gchempaint_logo.png
share/gchemutils/%%VER%%/radii.xml
share/gchemutils/%%VER%%/residues.xml
-share/gnome/help/gchem3d-%%VER%%/C/figures/ball-and-stick.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/cylinders.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchemcalc.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchempaint1.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchempaint2.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/main-window.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles1.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles2.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles3.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/spacefill.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/wireframe.png
-share/gnome/help/gchem3d-%%VER%%/C/gchem3d-%%VER%%.xml
-share/gnome/help/gchem3d-%%VER%%/C/legal.xml
-share/gnome/help/gchemcalc-%%VER%%/C/figures/braces.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/composition.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/formula.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/pattern.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/start.png
-share/gnome/help/gchemcalc-%%VER%%/C/gchemcalc-%%VER%%.xml
-share/gnome/help/gchemcalc-%%VER%%/C/legal.xml
-share/gnome/help/gchempaint-%%VER%%/C/figures/Hposdlg.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-heads.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object-dlg.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/bond-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/bond.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/brackets-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/brackets.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/chain-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/chain.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/charges.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/choose-elt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow-end.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cycle-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cyclentool-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cyclentool.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cycletools.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/downbond.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/einstein.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/electrons.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/element.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/elt-menu.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/equation-props.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/equation.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/eraser.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/fragment.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/ghemical.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/group.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/lasso-prop.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/lasso.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/main-window.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery-arrow.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu-bases.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu3d.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/new-template.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newfile.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newman-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newman.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-prop.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-sample.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-toolbox.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/phenyl-residue.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/phenyl-structure.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/preferences.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-atoms-font.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-atoms-other.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-bonds.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-text.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/properties.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction-arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction4.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction5.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/residues.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis4.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/rotate.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/selection.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/stereobonds.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/templates-tools.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/templates.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/text-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/text.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/toolbox.png
-share/gnome/help/gchempaint-%%VER%%/C/gchempaint-%%VER%%.xml
-share/gnome/help/gchempaint-%%VER%%/C/legal.xml
-share/gnome/help/gchemtable-%%VER%%/C/figures/add-plot.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/atomic-radii.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/blocs.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/choose-data.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/curve.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/elec.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/electronegativity.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/family.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/graph-guru.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/main.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/new-chart-guru.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/new-chart.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/radii.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/start.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/state.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/thermo.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/tip.png
-share/gnome/help/gchemtable-%%VER%%/C/gchemtable-%%VER%%.xml
-share/gnome/help/gchemtable-%%VER%%/C/legal.xml
-share/gnome/help/gcrystal-%%VER%%/C/figures/atoms-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/cleavages-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/default-view.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/lattice-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/lines-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/main-window.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/print-res.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/size-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/view-settings.png
-share/gnome/help/gcrystal-%%VER%%/C/gcrystal-%%VER%%.xml
-share/gnome/help/gcrystal-%%VER%%/C/legal.xml
-share/gnome/help/gspectrum-%%VER%%/C/figures/fid-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/gspectrum.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/ir-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/nmr-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/simple-toolbar.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/uv-vis-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/gspectrum-%%VER%%.xml
-share/gnome/help/gspectrum-%%VER%%/C/legal.xml
-share/omf/gchem3d-%%VER%%/gchem3d-%%VER%%-C.omf
-share/omf/gchemcalc-%%VER%%/gchemcalc-%%VER%%-C.omf
-share/omf/gchempaint-%%VER%%/gchempaint-%%VER%%-C.omf
-share/omf/gchemtable-%%VER%%/gchemtable-%%VER%%-C.omf
-share/omf/gcrystal-%%VER%%/gcrystal-%%VER%%-C.omf
-share/omf/gspectrum-%%VER%%/gspectrum-%%VER%%-C.omf
share/mimelnk/application/x-gchempaint.desktop
share/mimelnk/application/x-gcrystal.desktop
share/icons/hicolor/scalable/apps/gchem3d.svg