Bug 63366 - [Patch] Unbreak science/ghemical - depends on graphics/libglut
Summary: [Patch] Unbreak science/ghemical - depends on graphics/libglut
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Maho Nakata
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-02-25 22:40 UTC by Vladimir Tchoukharev
Modified: 2004-03-06 21:58 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Tchoukharev 2004-02-25 22:40:14 UTC
Port science/ghemical was broken due to lost dependency on graphics/libglut
The proposed patch fixes this particular dependency, though I did not 
check the port in a clean environment, so other lost dependencies are
still probable. 
OK, I want to ask this. For working (build after the patch) binary:

$ ldd `which ghemical` | cut -d ' ' -f 3 | xargs pkg_which | sort -u
/usr/local/bin/ghemical:: not found
?
XFree86-libraries-4.3.0_6
atlas-3.5.5,1
esound-0.2.32_1
gettext-0.13.1
glib-1.2.10_10
gnomelibs-1.4.2_2
gtk-1.2.10_11
gtkglarea-1.2.2_2
imlib-1.9.14_2
jpeg-6b_1
libaudiofile-0.2.5
libglade-0.17_3
libglut-5.0.2
libgnugetopt-1.2
libiconv-1.9.1_3
libungif-4.1.0b1_1
libxml-1.8.17_2
png-1.2.5_3
tiff-3.6.1_1

Should each of them be included in LIB_DEPENDS ?

portlint -AC gives warnings:
pkg_delete: unable to completely remove directory '/usr/local/share/gnome'
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
I believe this belongs to the ports system, not to the port...

Changes:
- Add graphics/libglut to BUILD_DEPENDS and LIB_DEPENDS.
- Remove explicit dependency on autoconf (portlint suggestion).
- Remove an empty line at the end of pkg-plist (portlint).
- Change some spaces to tabs (portlint).
- Add a shell script to convert fortran sources to c along descriptions
in README. Some changes are hidden to simplify comparison. This probably
should be omitted.
- Increase number of atoms from 60 to 90. (Attemp to set it to 120 failed.)

Last two changes were prepared few months ago, sorry for not
separating them from the more urgent staff (and for not sending them earlier!).

One more question. Should CONFIGURE_ARGS use "=" or "+=" ?

Best regards,
V.Chukharev

Fix: 

#
# Make new c sources from fortran sources, restore changes,
# made by Tommi Hassinen (3 comments are corrected additionally).
# Should be started in miniMOPAC directory.

f2c fortran/*.f
cp fortran/*.c ./
sed -e 's,/\* fortran/\(.*\)\.f -- translated by f2c (version 20000817),/\* \1.f -- translated by f2c (version 19991025),' \
-e 's,dscal_,mMdscal_,g' \
-e 's,dswap_,mMdswap_,g' \
-e 's,daxpy_,mMdaxpy_,g' \
-i '' *.c 
mv etime.c etime.c.orig
head -18 etime.c.orig > etime.c
echo '#include <time.h>' >> etime.c
tail +19 etime.c.orig >> etime.c
--- ghemical.-f2c.sh ends here -----KAZoYvABZjLQR5otsLzeTEeIGV7TKNjkvpusfcwgCD6uQHpS
Content-Type: text/plain; name="ghemical.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="ghemical.patch"

diff -ur ghemicalOLD/Makefile ghemical/Makefile
--- ghemicalOLD/Makefile	Mon Feb 23 21:30:45 2004
+++ ghemical/Makefile	Wed Feb 25 23:32:43 2004
@@ -2,7 +2,7 @@
 # Date created:			May 4, 2003
 # Whom:				Nakata Maho <maho@FreeBSD.org>
 #
-# $FreeBSD: ports/science/ghemical/Makefile,v 1.4 2004/02/23 00:35:23 kris Exp $
+# $FreeBSD: ports/science/ghemical/Makefile,v 1.1 2003/05/04 02:33:51 maho Exp $
 
 PORTNAME=	ghemical
 PORTVERSION=	1.00
@@ -10,22 +10,21 @@
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/ghemical/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=   .tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Ghemical is a computational chemistry software package
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		${LOCALBASE}/lib/libmpqc.a:${PORTSDIR}/science/mpqc
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmpqc.a:${PORTSDIR}/science/mpqc \
+		${X11BASE}/include/GL/glut.h:${PORTSDIR}/graphics/libglut
 LIB_DEPENDS=	gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea \
-		glade-gnome:${PORTSDIR}/devel/libglade
-
-BROKEN=		"Does not compile"
+		glade-gnome:${PORTSDIR}/devel/libglade \
+		glut:${PORTSDIR}/graphics/libglut
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GTK=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mpqc
 
 USE_AUTOCONF=	yes
@@ -39,6 +38,9 @@
 	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g; s|-lgtk|-lgtk12|g;' \
 			${WRKSRC}/Makefile.in
 pre-build:
+	@${REINPLACE_CMD} -e 's|MAXHEV=60, MAXLIT=60|MAXHEV=90, MAXLIT=90|g;' \
+			${WRKSRC}/miniMOPAC/fortran/SIZES
+	./ghemical-f2c.sh  ${WRKSRC}/miniMOPAC
 	@${REINPLACE_CMD} -e 's|f2c.h|g2c.h|g;' ${WRKSRC}/miniMOPAC/*.c
 	@${REINPLACE_CMD} -e 's|f2c.h|g2c.h|g;' ${WRKSRC}/src/common/qm1e_mopac.cpp
 .include <bsd.port.mk>
Only in ghemical: ghemical-f2c.sh
diff -ur ghemicalOLD/pkg-plist ghemical/pkg-plist
--- ghemicalOLD/pkg-plist	Sun May  4 05:33:51 2003
+++ ghemical/pkg-plist	Wed Feb 25 22:53:43 2004
@@ -141,4 +141,3 @@
 @dirrm share/ghemical/1.00/glade
 @dirrm share/ghemical/1.00
 @dirrm share/ghemical
-
Comment 1 Kirill Ponomarev freebsd_committer freebsd_triage 2004-02-25 22:41:59 UTC
Responsible Changed
From-To: freebsd-ports-bugs->maho

Over to maintainer.
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2004-03-06 12:03:39 UTC
State Changed
From-To: open->closed

Maintainer committed independent fix on Feb 27 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63366 

Sorry I didn't notice your PR. Merge your efforts
to current port. thank you very much