Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Aug 2018 08:13:10 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r476726 - in head: . science science/xdrawchem science/xdrawchem/files
Message-ID:  <201808090813.w798DAjB072430@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Thu Aug  9 08:13:10 2018
New Revision: 476726
URL: https://svnweb.freebsd.org/changeset/ports/476726

Log:
  Re-add port: science/xdrawchem: Two-dimensional molecule drawing program

Added:
  head/science/xdrawchem/
     - copied from r323747, head/biology/xdrawchem/
Deleted:
  head/science/xdrawchem/files/
Modified:
  head/MOVED
  head/science/Makefile
  head/science/xdrawchem/Makefile
  head/science/xdrawchem/distinfo
  head/science/xdrawchem/pkg-descr
  head/science/xdrawchem/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Aug  9 08:01:28 2018	(r476725)
+++ head/MOVED	Thu Aug  9 08:13:10 2018	(r476726)
@@ -4423,7 +4423,6 @@ audio/mpeglib_artsplug||2013-07-26|Has expired: Depend
 audio/prokyon3||2013-07-26|Has expired: Depends on Qt 3.x
 audio/xmms-kde||2013-07-26|Has expired: Depends on Qt 3.x
 audio/yammi||2013-07-26|Has expired: Depends on Qt 3.x
-biology/xdrawchem||2013-07-26|Has expired: Depends on Qt 3.x
 cad/opencascade-tutorial||2013-07-26|Has expired: Depends on Qt 3.x
 cad/vipec||2013-07-26|Has expired: Depends on Qt 3.x
 chinese/kde3-i18n-zh_CN||2013-07-26|Has expired: Depends on Qt 3.x

Modified: head/science/Makefile
==============================================================================
--- head/science/Makefile	Thu Aug  9 08:01:28 2018	(r476725)
+++ head/science/Makefile	Thu Aug  9 08:13:10 2018	(r476726)
@@ -247,6 +247,7 @@
     SUBDIR += vmd
     SUBDIR += voro++
     SUBDIR += xcrysden
+    SUBDIR += xdrawchem
     SUBDIR += xfce4-equake-plugin
     SUBDIR += xmakemol
 

Modified: head/science/xdrawchem/Makefile
==============================================================================
--- head/biology/xdrawchem/Makefile	Fri Jul 26 19:14:50 2013	(r323747)
+++ head/science/xdrawchem/Makefile	Thu Aug  9 08:13:10 2018	(r476726)
@@ -1,37 +1,26 @@
-# Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	xdrawchem
-PORTVERSION=	1.9.9
-PORTREVISION=	11
-CATEGORIES=	biology
-MASTER_SITES=	SF
+DISTVERSION=	1.10.2-1
+CATEGORIES=	science
 
-MAINTAINER=	hemi@puresimplicity.net
-COMMENT=	Chemical drawing program
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Two-dimensional molecule drawing program
 
-LIB_DEPENDS=	openbabel:${PORTSDIR}/science/openbabel
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_QT_VER=	3
+LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
-CONFIGURE_ENV=	QTINCDIR="${LOCALBASE}/include" \
-		QTLIBDIR="${LOCALBASE}/lib"
-LDFLAGS+=	-lm
+USES=		qmake qt:5
+USE_GITHUB=	yes
+GH_ACCOUNT=	bryanherger
+USE_QT=		core gui network printsupport widgets xml buildtools_build
+USE_GL=		gl
 
-MAKE_ARGS+=	LDFLAGS+="-lqt-mt ${PTHREAD_LIBS}"
+WRKSRC_SUBDIR=	${PORTNAME}-qt5
 
-.include <bsd.port.pre.mk>
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.if ${ARCH}==sparc64
-BROKEN=		does not compile on ${ARCH}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|g' ${WRKSRC}/xdrawchem/application_ob.cpp
-	@${REINPLACE_CMD} -e \
-		's|lround|(long int)rint|g' ${WRKSRC}/xdrawchem/*.cpp
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/science/xdrawchem/distinfo
==============================================================================
--- head/biology/xdrawchem/distinfo	Fri Jul 26 19:14:50 2013	(r323747)
+++ head/science/xdrawchem/distinfo	Thu Aug  9 08:13:10 2018	(r476726)
@@ -1,2 +1,3 @@
-SHA256 (xdrawchem-1.9.9.tar.gz) = 33e45ee8b937ba4ea77fb28adca66195943715a941039a95d0a4bed09d4cf9e3
-SIZE (xdrawchem-1.9.9.tar.gz) = 982481
+TIMESTAMP = 1533775206
+SHA256 (bryanherger-xdrawchem-1.10.2-1_GH0.tar.gz) = 009b525e570cd79b3e59880877871e258071fecdef6c397d7533f3920faa9a7e
+SIZE (bryanherger-xdrawchem-1.10.2-1_GH0.tar.gz) = 2888990

Modified: head/science/xdrawchem/pkg-descr
==============================================================================
--- head/biology/xdrawchem/pkg-descr	Fri Jul 26 19:14:50 2013	(r323747)
+++ head/science/xdrawchem/pkg-descr	Thu Aug  9 08:13:10 2018	(r476726)
@@ -1,10 +1,8 @@
-from the Web page and the Freshmeat listing:
-
 XDrawChem is a program for drawing chemical structures in two
-dimensions.  It comes with a library of amino acids and nucleic
-acids.  It can read and write MDL Molfiles, read and write CML
+dimensions. It comes with a library of amino acids and nucleic
+acids. It can read and write MDL Molfiles, read and write CML
 (Chemical Markup Language), read (some?) ChemDraw XML and binary
-files, and export to EPS.  It can predict 13C NMR and simple IR
-spectra.  It works under Unix or Windows.
+files, and export to EPS. It can predict 13C NMR and simple IR
+spectra. It works under Unix or Windows.
 
-WWW:  http://xdrawchem.sourceforge.net
+WWW: https://www.woodsidelabs.com/chemistry/xdrawchem.php

Modified: head/science/xdrawchem/pkg-plist
==============================================================================
--- head/biology/xdrawchem/pkg-plist	Fri Jul 26 19:14:50 2013	(r323747)
+++ head/science/xdrawchem/pkg-plist	Thu Aug  9 08:13:10 2018	(r476726)
@@ -1,10 +1,17 @@
 bin/xdrawchem
 %%DATADIR%%/6ring_boat.cml
+%%DATADIR%%/6ring_boat.png
 %%DATADIR%%/6ring_chair.cml
+%%DATADIR%%/6ring_chair.png
+%%DATADIR%%/CMakeLists.txt
+%%DATADIR%%/COPYRIGHT.txt
+%%DATADIR%%/GPL.txt
+%%DATADIR%%/HISTORY.txt
 %%DATADIR%%/adenine.cml
 %%DATADIR%%/alanine.cml
 %%DATADIR%%/anthracene.cml
 %%DATADIR%%/arginine.cml
+%%DATADIR%%/arrowtool.png
 %%DATADIR%%/asparagine.cml
 %%DATADIR%%/aspartic_acid.cml
 %%DATADIR%%/back.xpm
@@ -13,17 +20,26 @@ bin/xdrawchem
 %%DATADIR%%/biotin.cml
 %%DATADIR%%/biphenyl.cml
 %%DATADIR%%/boc.cml
+%%DATADIR%%/boldtool.png
+%%DATADIR%%/brackettool.png
 %%DATADIR%%/caslist.txt
+%%DATADIR%%/chaintool.png
+%%DATADIR%%/copytool.png
+%%DATADIR%%/curvearrowtool.png
+%%DATADIR%%/cuttool.png
 %%DATADIR%%/cyclobutane.cml
+%%DATADIR%%/cyclobutane.png
 %%DATADIR%%/cycloheptane.cml
 %%DATADIR%%/cyclohexane.cml
 %%DATADIR%%/cyclohexane.png
 %%DATADIR%%/cyclooctane.cml
 %%DATADIR%%/cyclopentadiene-sp.cml
 %%DATADIR%%/cyclopentadiene.cml
+%%DATADIR%%/cyclopentadiene.png
 %%DATADIR%%/cyclopentane.cml
 %%DATADIR%%/cyclopentane.png
 %%DATADIR%%/cyclopropane.cml
+%%DATADIR%%/cyclopropane.png
 %%DATADIR%%/cysteine.cml
 %%DATADIR%%/cytosine.cml
 %%DATADIR%%/d-fructose.cml
@@ -31,6 +47,7 @@ bin/xdrawchem
 %%DATADIR%%/dabcyl.cml
 %%DATADIR%%/dabsyl.cml
 %%DATADIR%%/dansyl.cml
+%%DATADIR%%/dashtool.png
 %%DATADIR%%/deoxyribose.cml
 %%DATADIR%%/doc/COPYRIGHT.txt
 %%DATADIR%%/doc/GPL.txt
@@ -38,6 +55,9 @@ bin/xdrawchem
 %%DATADIR%%/doc/arrowtool.png
 %%DATADIR%%/doc/boldtool.png
 %%DATADIR%%/doc/brackettool.png
+%%DATADIR%%/doc/cb.png
+%%DATADIR%%/doc/cbf.png
+%%DATADIR%%/doc/cbh.png
 %%DATADIR%%/doc/cinna.png
 %%DATADIR%%/doc/color_pulldown.png
 %%DATADIR%%/doc/copytool.png
@@ -78,7 +98,15 @@ bin/xdrawchem
 %%DATADIR%%/doc/toolmenu.html
 %%DATADIR%%/doc/underlinetool.png
 %%DATADIR%%/doc/uptool.png
+%%DATADIR%%/downtool.png
 %%DATADIR%%/edans.cml
+%%DATADIR%%/editcut.png
+%%DATADIR%%/editpaste.png
+%%DATADIR%%/erasetool.png
+%%DATADIR%%/filenew.png
+%%DATADIR%%/fileopen.png
+%%DATADIR%%/fileprint.png
+%%DATADIR%%/filesave.png
 %%DATADIR%%/fmoc.cml
 %%DATADIR%%/forward.xpm
 %%DATADIR%%/glutamic_acid.cml
@@ -91,26 +119,56 @@ bin/xdrawchem
 %%DATADIR%%/imidazole.png
 %%DATADIR%%/indole.cml
 %%DATADIR%%/isoleucine.cml
+%%DATADIR%%/italictool.png
+%%DATADIR%%/justifycentertool.png
+%%DATADIR%%/justifylefttool.png
+%%DATADIR%%/justifyrighttool.png
+%%DATADIR%%/lassotool.png
 %%DATADIR%%/leucine.cml
+%%DATADIR%%/line1.png
+%%DATADIR%%/line2.png
+%%DATADIR%%/line3.png
+%%DATADIR%%/line4.png
+%%DATADIR%%/line5.png
+%%DATADIR%%/linetool.png
 %%DATADIR%%/lysine.cml
+%%DATADIR%%/mag_minus.png
+%%DATADIR%%/mag_plus.png
 %%DATADIR%%/methionine.cml
 %%DATADIR%%/naphthalene.cml
 %%DATADIR%%/nitrophenylalanine.cml
+%%DATADIR%%/pastetool.png
 %%DATADIR%%/phenylalanine.cml
 %%DATADIR%%/proline.cml
 %%DATADIR%%/purine.cml
 %%DATADIR%%/pyrimidine.cml
 %%DATADIR%%/retro.txt
 %%DATADIR%%/ribose.cml
+%%DATADIR%%/ringtool.png
+%%DATADIR%%/selecttool.png
 %%DATADIR%%/serine.cml
 %%DATADIR%%/statine.cml
 %%DATADIR%%/steroid.cml
+%%DATADIR%%/subscript.png
+%%DATADIR%%/superscript.png
+%%DATADIR%%/sym_1e.png
+%%DATADIR%%/sym_2e.png
+%%DATADIR%%/sym_2e_line.png
+%%DATADIR%%/sym_delta_minus.png
+%%DATADIR%%/sym_delta_plus.png
+%%DATADIR%%/sym_minus.png
+%%DATADIR%%/sym_plus.png
+%%DATADIR%%/symboltool.png
+%%DATADIR%%/texttool.png
 %%DATADIR%%/threonine.cml
 %%DATADIR%%/thymine.cml
 %%DATADIR%%/tryptophan.cml
 %%DATADIR%%/tyrosine.cml
+%%DATADIR%%/underlinetool.png
+%%DATADIR%%/uptool.png
 %%DATADIR%%/uracil.cml
 %%DATADIR%%/valine.cml
+%%DATADIR%%/wavytool.png
 %%DATADIR%%/xdrawchem-icon.png
 %%DATADIR%%/xdrawchem_da.qm
 %%DATADIR%%/xdrawchem_de.qm
@@ -122,5 +180,3 @@ bin/xdrawchem
 %%DATADIR%%/xdrawchem_pl.qm
 %%DATADIR%%/xdrawchem_ru.qm
 %%DATADIR%%/xdrawchemrc
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808090813.w798DAjB072430>