From nobody Thu Aug 11 13:33:17 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M3SRx3nwDz4YyXJ; Thu, 11 Aug 2022 13:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3SRx2nqdz3BnG; Thu, 11 Aug 2022 13:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660224797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+YyIq9GyKyeJJvJy0IXbW9SvD66IjcpcFipTqgFfQE=; b=Ek3taloyKg01GnEuMk77Ccavr6Lx6yjsMSc2/F5WAArunHZgTKdhQLSJ7nfSk8MyokMntn oM1kyCpLZyokL4wgW/p0gSv+Up1QYqlHPj9R24s/9wf1YcZ70Pw1grycZRwXeadUAuPgi1 YpGpkm5p1I0jWmWAtFiQNmOpNAZfiujl+zBFeHGvGERKXNfSQp97hB8vrh1mCruVYDnIUV FpvnjFl9nVsq/Nc4TAjg7FSC2L5zaaU+trQ7G8OWeFSQzZe7lQYzNc+7NXiC611VnKoive kKbMCtK4b/eEvcksUFsqlKaFcJtIoQ9kT4Asj6UIjyDrBOspsMdv6U2jzT7tcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M3SRx1Vdqzsxw; Thu, 11 Aug 2022 13:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27BDXHAx022628; Thu, 11 Aug 2022 13:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BDXHLT022627; Thu, 11 Aug 2022 13:33:17 GMT (envelope-from git) Date: Thu, 11 Aug 2022 13:33:17 GMT Message-Id: <202208111333.27BDXHLT022627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 9ac6817b1750 - 2022Q3 - science/chemtool-devel: Fix build on FreeBSD 13.1R and 14 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 9ac6817b1750992c19942fc86e6f785fd776d74e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660224797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+YyIq9GyKyeJJvJy0IXbW9SvD66IjcpcFipTqgFfQE=; b=RuDn0V+F8WkzzTWIVGW1xuz/Su6O6BshVeyb9fZJSJbqtA7m88TymqIiVodMhBGjxFW8p2 UrCJCPJAsmt9PVw1q/4Qqg+JOC+KA86OqxZpipahzGRWvE23cB8F/VRBRHnDHVnpig2KhL qYH/UHuPxYXMm5+xEkUdpeETqepkglwGcx006fvFm956ATpmPnRGzEgEKyZpVvaqkFMkd6 fgXgY2Xry8BGOXvaSfCqe+mZU2QsMXJZ4DE0Ff8mBiwypoLHMQTYh80+77g1m2tBHxv+Ir oEl+Sti5raFzauMp1pkBAgPqvuRfY3znV3dB8sybAL1uSTNnugKpYIe6hxhI4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660224797; a=rsa-sha256; cv=none; b=cPSLZfh2HWzlQEz2W7x8uetcd0c1LmZSwgu5Idyx3au64viMBO43pKeXsE1FNhYBFizyqC +E97OvkKwUuNO9ucCd7HED6vJ7PTGcPORx+D3SC3DhZk7iCZlJ+h3gayaisciwJPuHCzf1 hqyHF6QayMECceO7m7ELVPPMavUIJr4/sQaUH0B7hPtCC//ZWQDWnCVtzELPv7eU9TLuQ0 KrkoRTyPquLpYelfFJKPUg7BMr211k4Y4DFJ+7c4XEAbXWxCun8JMzz3p7mC8YTduv6Ytp U5jSwUJCFjAO14mJDMrYZ4Mjgr3qS6INHZyU4urbuOy4uSAyunWBcbfa2+qLQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ac6817b1750992c19942fc86e6f785fd776d74e commit 9ac6817b1750992c19942fc86e6f785fd776d74e Author: Robert Clausecker AuthorDate: 2022-08-04 13:20:30 +0000 Commit: Nuno Teixeira CommitDate: 2022-08-11 13:32:55 +0000 science/chemtool-devel: Fix build on FreeBSD 13.1R and 14 - Same fix as 4bfc3a9 for science/chemtool. - While we are at it, define LICENSE. The license is not shipped, but from the README it is clearly the authors intent to have the same license as for science/chemtool. while I'm here: - cleanup Makefile - remove unnecessary patch and reinplace cmd - add EXAMPLES option - add missing LIB_DEPENDS and USE_GNOME deps (Q/A check) - adopt port PR: 265614 (cherry picked from commit cb127c6a8da1307a823f638a0489336222bd3f10) --- science/chemtool-devel/Makefile | 31 +++++++++++++++------- science/chemtool-devel/files/patch-configure | 22 ---------------- science/chemtool-devel/pkg-plist | 39 ---------------------------- 3 files changed, 21 insertions(+), 71 deletions(-) diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile index c78ebf5259c2..790a88085548 100644 --- a/science/chemtool-devel/Makefile +++ b/science/chemtool-devel/Makefile @@ -2,38 +2,49 @@ PORTNAME= chemtool PORTVERSION= 1.7.20050716 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= science MASTER_SITES= http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ PKGNAMESUFFIX= -devel DISTNAME= ct17a15 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Drawing organic molecules easily and store them (developer version) -BROKEN_FreeBSD_13= ld: error: duplicate symbol: babelin -BROKEN_FreeBSD_14= ld: error: duplicate symbol: babelin +LICENSE= GPLv2 -LIB_DEPENDS= libEMF.so:graphics/libemf +LIB_DEPENDS= libEMF.so:graphics/libemf \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz RUN_DEPENDS= fig2dev:print/fig2dev USES= compiler:c++11-lang gettext gmake gnome pkgconfig tar:tgz xorg -WRKSRC= ${WRKDIR}/${PORTNAME}-1.7alpha15/ -USE_GNOME= gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-emf=yes MAKE_ARGS+= MAKE=${MAKE_CMD} -MAKE_JOBS_UNSAFE= yes +CFLAGS+= -fcommon CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF LIBS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= chemtool + +WRKSRC= ${WRKDIR}/${PORTNAME}-1.7alpha15/ + +PORTEXAMPLES= * +OPTIONS_DEFINE= EXAMPLES + post-patch: - @${REINPLACE_CMD} 's/-lstdc++//' ${WRKSRC}/configure @${REINPLACE_CMD} '/^SYS_LIBRARIES =/s/$$/ -lX11/' ${WRKSRC}/Makefile.in post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chemtool + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cht + +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/science/chemtool-devel/files/patch-configure b/science/chemtool-devel/files/patch-configure deleted file mode 100644 index d2721910d5fb..000000000000 --- a/science/chemtool-devel/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.in~ Sun Jul 17 01:15:14 2005 -+++ configure.in Sun Nov 20 11:30:35 2005 -@@ -252,7 +252,7 @@ - if test x$enable_emf = xyes; then - AC_MSG_RESULT(yes) - AC_DEFINE(EMF) -- EMFLIBS="-lEMF -lstdc++" -+ EMFLIBS="-L%%LOCALBASE%%/lib -lEMF -lstdc++" - else - AC_MSG_RESULT(no) - EMFLIBS="" ---- configure~ Sun Nov 20 11:29:37 2005 -+++ configure Sun Nov 20 11:31:32 2005 -@@ -2859,7 +2859,7 @@ - #define EMF 1 - EOF - -- EMFLIBS="-lEMF -lstdc++" -+ EMFLIBS="-L%%LOCALBASE%%/lib -lEMF -lstdc++" - else - echo "$ac_t""no" 1>&6 - EMFLIBS="" diff --git a/science/chemtool-devel/pkg-plist b/science/chemtool-devel/pkg-plist index 9a74e333b704..28ddc6b88232 100644 --- a/science/chemtool-devel/pkg-plist +++ b/science/chemtool-devel/pkg-plist @@ -2,45 +2,6 @@ bin/chemtool bin/cht man/man1/chemtool.1.gz man/man1/cht.1.gz -%%EXAMPLESDIR%%/14263232.mol -%%EXAMPLESDIR%%/AMP.cht -%%EXAMPLESDIR%%/Adenosine.cht -%%EXAMPLESDIR%%/Dehydrotubifolin.cht -%%EXAMPLESDIR%%/G-host.pdb -%%EXAMPLESDIR%%/Indolizomycin.cht -%%EXAMPLESDIR%%/Lepicidin-A-Aglycon.cht -%%EXAMPLESDIR%%/Neu2 -%%EXAMPLESDIR%%/amine.mol -%%EXAMPLESDIR%%/anabsinthin.cht -%%EXAMPLESDIR%%/anthocyanidine.cht -%%EXAMPLESDIR%%/atp.cht -%%EXAMPLESDIR%%/bcarotin.pdb -%%EXAMPLESDIR%%/breve.cht -%%EXAMPLESDIR%%/breve.mol -%%EXAMPLESDIR%%/breve_frag.cht -%%EXAMPLESDIR%%/breve_frag.mol -%%EXAMPLESDIR%%/bufotalin.cht -%%EXAMPLESDIR%%/byrostatin1.cht -%%EXAMPLESDIR%%/c70.cht -%%EXAMPLESDIR%%/camphor.cht -%%EXAMPLESDIR%%/chlorophyll.cht -%%EXAMPLESDIR%%/claisen.cht -%%EXAMPLESDIR%%/dodecahedran.cht -%%EXAMPLESDIR%%/indigo.cht -%%EXAMPLESDIR%%/kdo.cht -%%EXAMPLESDIR%%/krebs.cht -%%EXAMPLESDIR%%/labeltest -%%EXAMPLESDIR%%/pagodan.cht -%%EXAMPLESDIR%%/penicillin_v.cht -%%EXAMPLESDIR%%/pteridin.cht -%%EXAMPLESDIR%%/reaction.cht -%%EXAMPLESDIR%%/rutamycin_b.cht -%%EXAMPLESDIR%%/sample.sdf -%%EXAMPLESDIR%%/tbutylazulene.cht -%%EXAMPLESDIR%%/tcdd.cht -%%EXAMPLESDIR%%/tetracyclin.cht -%%EXAMPLESDIR%%/v3000.mol -%%EXAMPLESDIR%%/viagra.cht share/locale/cs/LC_MESSAGES/chemtool.mo share/locale/de/LC_MESSAGES/chemtool.mo share/locale/fr/LC_MESSAGES/chemtool.mo