Date: Tue, 10 Dec 2002 00:25:25 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46128: Update port: biology/xdrawchem to 1.6.1 (fix ports/40241) Message-ID: <20021210002525.79dc9029.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46128 >Category: ports >Synopsis: Update port: biology/xdrawchem to 1.6.1 (fix ports/40241) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 09 07:40:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.6.1 New file: pkg-plist Remove file: files/patch-aa Following PRs should be superseded by this one: [2002/06/17] ports/39426 trevor Update port: biology/xdrawchem to 1.3.2 [2002/07/05] ports/40241 trevor Update port: biology/xdrawchem to 1.4 (fix ports/39426) [2002/11/18] ports/45420 trevor Update port: biology/xdrawchem to 1.6 (fix ports/40241) >How-To-Repeat: >Fix: diff -urN /usr/ports/biology/xdrawchem/Makefile biology/xdrawchem/Makefile --- /usr/ports/biology/xdrawchem/Makefile Tue Jan 29 18:39:58 2002 +++ biology/xdrawchem/Makefile Sat Dec 7 08:49:19 2002 @@ -6,46 +6,38 @@ # PORTNAME= xdrawchem -PORTVERSION= 0.99.7 +PORTVERSION= 1.6.1 CATEGORIES= biology MASTER_SITES= http://www.prism.gatech.edu/~gte067k/xdrawchem/ EXTRACT_SUFX= .tgz MAINTAINER= trevor@FreeBSD.org -MAKE_ENV= QTDIR="${X11BASE}" -PLIST= ${WRKDIR}/pkg-plist +#CFLAGS+= -O0 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +GNU_CONFIGURE= yes +QTCFGLIBS+= ${PTHREAD_LIBS} +QTCPPFLAGS+= ${PTHREAD_CFLAGS} USE_GMAKE= yes -USE_QT_VER= 2 +USE_QT_VER= 3 +USE_REINPLACE= yes USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} -pre-build: - cd ${WRKSRC}; \ - ${CXX} ${CXXFLAGS} -O0 -c -DRINGHOME="\"${PREFIX}/share/xdrawchem/\"" -I${X11BASE}/include/qt2 -o molecule_tools.o molecule_tools.cpp +post-patch: + @${REINPLACE_CMD} -e 's|ring doc|ring|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|^CPPFLAGS = -I/usr/X11R6/include|CPPFLAGS = @CPPFLAGS@|g ; \ + s|^CXXFLAGS = -g|CXXFLAGS = @CXXFLAGS@|g' \ + ${WRKSRC}/xdrawchem/Makefile.in + @${REINPLACE_CMD} -e \ + 's|malloc\.h|stdlib.h|g' ${WRKSRC}/xdrawchem/application_ob.cpp -pre-install: - ${ECHO_CMD} bin/xdrawchem > ${PLIST} - ${LS} ${WRKSRC}/ring | \ - ${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST} - ${ECHO_CMD} @dirrm share/xdrawchem >> ${PLIST} +post-install: .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${LS} *txt | \ - ${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST} - ${ECHO_CMD} @dirrm share/doc/xdrawchem >> ${PLIST} - ${LS} ${WRKSRC}/save | \ - ${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST} - ${ECHO_CMD} @dirrm share/examples/xdrawchem >> ${PLIST} -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xdrawchem ${PREFIX}/bin - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/ring/* ${DATADIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/save/* ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/*txt ${DOCSDIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR} .endif .include <bsd.port.mk> diff -urN /usr/ports/biology/xdrawchem/distinfo biology/xdrawchem/distinfo --- /usr/ports/biology/xdrawchem/distinfo Sun Jan 20 11:45:37 2002 +++ biology/xdrawchem/distinfo Sat Dec 7 08:19:53 2002 @@ -1 +1 @@ -MD5 (xdrawchem-0.99.7.tgz) = b6ce1837704771e329055f283d814f35 +MD5 (xdrawchem-1.6.1.tgz) = e886129aa48a99706dedba5de4f96c38 diff -urN /usr/ports/biology/xdrawchem/files/patch-aa biology/xdrawchem/files/patch-aa --- /usr/ports/biology/xdrawchem/files/patch-aa Sun Jan 20 11:45:37 2002 +++ biology/xdrawchem/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,51 +0,0 @@ ---- Makefile.orig Sat Dec 1 10:36:43 2001 -+++ Makefile Sat Jan 19 16:07:48 2002 -@@ -1,26 +1,25 @@ - # XDrawChem configuration stuff - # INSTDIR: The directory where the binary will go. Should be in your path. --# The default is /usr/local/bin -+# The default is ${PREFIX}/bin - # INSTRING: The directory where you will store ring templates (without quotes). - # RINGDIR: The directory where you will store ring templates (with quotes). - # INSTRING and RINGDIR should be the same :) --# Default should be /usr/local/lib/xdrawchem -+# Default should be ${PREFIX}/lib/xdrawchem - # if you change RINGDIR, remember to put "\" before the directory, - # and \"" after it, so the preprocessor will insert quotes correctly - # SERVER: database server. OK to set to "herger.ibb.gatech.edu"; - # as of version 0.98, there are no other servers :) - --INSTDIR = /usr/local/bin --INSTRING = /usr/local/lib/xdrawchem --RINGDIR = "\"/usr/local/lib/xdrawchem/\"" -+INSTDIR = ${PREFIX}/bin -+INSTRING = ${PREFIX}/share/xdrawchem -+RINGDIR = "\"${PREFIX}/share/xdrawchem/\"" - SERVER = "\"herger.ibb.gatech.edu\"" - - ## Platform-specific flags -- uncomment appropriate section - ## For Linux, SGI IRIX 6.5 using gcc/g++ --CXX = g++ --INCPATH = -I/usr/include -I$(QTDIR)/include --LIBS = -lqt -lXext -lX11 -lm --MOC = $(QTDIR)/bin/moc -+INCPATH = -I$(QTDIR)/include/qt2 -+LIBS = -lqt2 -lXext -lX11 -lm -+MOC = $(QTDIR)/bin/moc2 - - ## for Sun - #CXX = CC -@@ -37,10 +36,9 @@ - ## end of platform-specific flags - - ## other compiler flags --CXXFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) --CC = gcc --CFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) --LFLAGS = -g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib -+CXXFLAGS += -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) -+CFLAGS += -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) -+LFLAGS += -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib - - - ####### Target diff -urN /usr/ports/biology/xdrawchem/pkg-plist biology/xdrawchem/pkg-plist --- /usr/ports/biology/xdrawchem/pkg-plist Thu Jan 1 09:00:00 1970 +++ biology/xdrawchem/pkg-plist Sat Nov 9 03:42:39 2002 @@ -0,0 +1,129 @@ +bin/babel +bin/xdrawchem +%%PORTDOCS%%share/doc/xdrawchem/COPYRIGHT.txt +%%PORTDOCS%%share/doc/xdrawchem/GPL.txt +%%PORTDOCS%%share/doc/xdrawchem/HISTORY.txt +%%PORTDOCS%%share/doc/xdrawchem/arrowtool.png +%%PORTDOCS%%share/doc/xdrawchem/boldtool.png +%%PORTDOCS%%share/doc/xdrawchem/brackettool.png +%%PORTDOCS%%share/doc/xdrawchem/cinna.png +%%PORTDOCS%%share/doc/xdrawchem/color_pulldown.png +%%PORTDOCS%%share/doc/xdrawchem/copytool.png +%%PORTDOCS%%share/doc/xdrawchem/curvearrowtool.png +%%PORTDOCS%%share/doc/xdrawchem/cuttool.png +%%PORTDOCS%%share/doc/xdrawchem/dashtool.png +%%PORTDOCS%%share/doc/xdrawchem/downtool.png +%%PORTDOCS%%share/doc/xdrawchem/draw.html +%%PORTDOCS%%share/doc/xdrawchem/edit.html +%%PORTDOCS%%share/doc/xdrawchem/editmenu.html +%%PORTDOCS%%share/doc/xdrawchem/erasetool.png +%%PORTDOCS%%share/doc/xdrawchem/filemenu.html +%%PORTDOCS%%share/doc/xdrawchem/fileopen.png +%%PORTDOCS%%share/doc/xdrawchem/fileprint.png +%%PORTDOCS%%share/doc/xdrawchem/files.html +%%PORTDOCS%%share/doc/xdrawchem/filesave.png +%%PORTDOCS%%share/doc/xdrawchem/font_pulldown.png +%%PORTDOCS%%share/doc/xdrawchem/formatmenu.html +%%PORTDOCS%%share/doc/xdrawchem/functions.html +%%PORTDOCS%%share/doc/xdrawchem/groupmenu.html +%%PORTDOCS%%share/doc/xdrawchem/helpmenu.html +%%PORTDOCS%%share/doc/xdrawchem/index.html +%%PORTDOCS%%share/doc/xdrawchem/italictool.png +%%PORTDOCS%%share/doc/xdrawchem/linetool.png +%%PORTDOCS%%share/doc/xdrawchem/molinfo.html +%%PORTDOCS%%share/doc/xdrawchem/pastetool.png +%%PORTDOCS%%share/doc/xdrawchem/ringtool.png +%%PORTDOCS%%share/doc/xdrawchem/ringtoolbar.png +%%PORTDOCS%%share/doc/xdrawchem/selecttool.png +%%PORTDOCS%%share/doc/xdrawchem/spectra.html +%%PORTDOCS%%share/doc/xdrawchem/subscript.png +%%PORTDOCS%%share/doc/xdrawchem/superscript.png +%%PORTDOCS%%share/doc/xdrawchem/symboltool.png +%%PORTDOCS%%share/doc/xdrawchem/text.html +%%PORTDOCS%%share/doc/xdrawchem/texttool.png +%%PORTDOCS%%share/doc/xdrawchem/thick_pulldown.png +%%PORTDOCS%%share/doc/xdrawchem/toolbar.html +%%PORTDOCS%%share/doc/xdrawchem/toolmenu.html +%%PORTDOCS%%share/doc/xdrawchem/underlinetool.png +%%PORTDOCS%%share/doc/xdrawchem/uptool.png +share/openbabel/aromatic.txt +share/openbabel/atomtyp.txt +share/openbabel/element.txt +share/openbabel/extable.txt +share/openbabel/phmodel.txt +share/openbabel/resdata.txt +share/openbabel/types.txt +share/xdrawchem/6ring_boat.cml +share/xdrawchem/6ring_chair.cml +share/xdrawchem/adenine.cml +share/xdrawchem/alanine.cml +share/xdrawchem/anthracene.cml +share/xdrawchem/arginine.cml +share/xdrawchem/asparagine.cml +share/xdrawchem/aspartic_acid.cml +share/xdrawchem/back.xpm +share/xdrawchem/benzene.cml +share/xdrawchem/benzene.png +share/xdrawchem/biphenyl.cml +share/xdrawchem/boc.cml +share/xdrawchem/cyclobutane.cml +share/xdrawchem/cycloheptane.cml +share/xdrawchem/cyclohexane.cml +share/xdrawchem/cyclohexane.png +share/xdrawchem/cyclooctane.cml +share/xdrawchem/cyclopentadiene-sp.cml +share/xdrawchem/cyclopentadiene.cml +share/xdrawchem/cyclopentane.cml +share/xdrawchem/cyclopentane.png +share/xdrawchem/cyclopropane.cml +share/xdrawchem/cysteine.cml +share/xdrawchem/cytosine.cml +share/xdrawchem/d-fructose.cml +share/xdrawchem/d-glucose.cml +share/xdrawchem/dabcyl.cml +share/xdrawchem/dabsyl.cml +share/xdrawchem/dansyl.cml +share/xdrawchem/deoxyribose.cml +share/xdrawchem/edans.cml +share/xdrawchem/fmoc.cml +share/xdrawchem/forward.xpm +share/xdrawchem/glutamic_acid.cml +share/xdrawchem/glutamine.cml +share/xdrawchem/glycine.cml +share/xdrawchem/guanine.cml +share/xdrawchem/histidine.cml +share/xdrawchem/home.xpm +share/xdrawchem/imidazole.cml +share/xdrawchem/imidazole.png +share/xdrawchem/indole.cml +share/xdrawchem/isoleucine.cml +share/xdrawchem/leucine.cml +share/xdrawchem/lysine.cml +share/xdrawchem/methionine.cml +share/xdrawchem/naphthalene.cml +share/xdrawchem/nitrophenylalanine.cml +share/xdrawchem/phenylalanine.cml +share/xdrawchem/proline.cml +share/xdrawchem/purine.cml +share/xdrawchem/pyrimidine.cml +share/xdrawchem/ribose.cml +share/xdrawchem/serine.cml +share/xdrawchem/statine.cml +share/xdrawchem/steroid.cml +share/xdrawchem/threonine.cml +share/xdrawchem/thymine.cml +share/xdrawchem/tryptophan.cml +share/xdrawchem/tyrosine.cml +share/xdrawchem/uracil.cml +share/xdrawchem/valine.cml +share/xdrawchem/xdrawchem_de.qm +share/xdrawchem/xdrawchem_en.qm +share/xdrawchem/xdrawchem_es.qm +share/xdrawchem/xdrawchem_fr.qm +share/xdrawchem/xdrawchem_it.qm +share/xdrawchem/xdrawchem_nl.qm +share/xdrawchem/xdrawchem_pl.qm +share/xdrawchem/xdrawchemrc +@dirrm share/xdrawchem +@dirrm share/openbabel +%%PORTDOCS%%@dirrm share/doc/xdrawchem >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021210002525.79dc9029.tkato>