ports/51971: Update port: biology/xdrawchem to 1.6.10 (fix ports/46934)
KATO Tsuguru
tkato at prontomail.com
Thu May 8 14:30:25 UTC 2003
>Number: 51971
>Category: ports
>Synopsis: Update port: biology/xdrawchem to 1.6.10 (fix ports/46934)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 08 07:30:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to verwion 1.6.10
New file:
pkg-plist
Remove file:
filesa/patch-aa
Following PR(s) 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)
[2002/12/09] ports/46128 trevor Update port: biology/xdrawchem to 1.6.1 (fix ports/40241)
[2003/01/10] ports/46934 trevor Update port: biology/xdrawchem to 1.6.3 (fix ports/46128)
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/biology/xdrawchem/Makefile biology/xdrawchem/Makefile
--- /usr/ports/biology/xdrawchem/Makefile Sat Apr 12 22:36:57 2003
+++ biology/xdrawchem/Makefile Thu May 8 07:06:31 2003
@@ -6,7 +6,7 @@
#
PORTNAME= xdrawchem
-PORTVERSION= 0.99.7
+PORTVERSION= 1.6.10
CATEGORIES= biology
MASTER_SITES= http://www.prism.gatech.edu/~gte067k/xdrawchem/
EXTRACT_SUFX= .tgz
@@ -14,39 +14,22 @@
MAINTAINER= trevor at FreeBSD.org
COMMENT= Chemical drawing program
-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
-
-pre-install:
- ${ECHO_CMD} bin/xdrawchem > ${PLIST}
- ${LS} ${WRKSRC}/ring | \
- ${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST}
- ${ECHO_CMD} @dirrm share/xdrawchem >> ${PLIST}
-.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}
-.endif
+post-patch:
+ @${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
.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 Thu May 8 04:48:00 2003
@@ -1 +1 @@
-MD5 (xdrawchem-0.99.7.tgz) = b6ce1837704771e329055f283d814f35
+MD5 (xdrawchem-1.6.10.tgz) = 9930b86c55dda395dce7bbca0e2be27c
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 Thu May 8 05:58:17 2003
@@ -0,0 +1,127 @@
+bin/xdrawchem
+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/aromatic.txt
+share/xdrawchem/asparagine.cml
+share/xdrawchem/aspartic_acid.cml
+share/xdrawchem/atomtyp.txt
+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/doc/COPYRIGHT.txt
+share/xdrawchem/doc/GPL.txt
+share/xdrawchem/doc/HISTORY.txt
+share/xdrawchem/doc/arrowtool.png
+share/xdrawchem/doc/boldtool.png
+share/xdrawchem/doc/brackettool.png
+share/xdrawchem/doc/cinna.png
+share/xdrawchem/doc/color_pulldown.png
+share/xdrawchem/doc/copytool.png
+share/xdrawchem/doc/curvearrowtool.png
+share/xdrawchem/doc/cuttool.png
+share/xdrawchem/doc/dashtool.png
+share/xdrawchem/doc/downtool.png
+share/xdrawchem/doc/draw.html
+share/xdrawchem/doc/edit.html
+share/xdrawchem/doc/editmenu.html
+share/xdrawchem/doc/erasetool.png
+share/xdrawchem/doc/filemenu.html
+share/xdrawchem/doc/fileopen.png
+share/xdrawchem/doc/fileprint.png
+share/xdrawchem/doc/files.html
+share/xdrawchem/doc/filesave.png
+share/xdrawchem/doc/font_pulldown.png
+share/xdrawchem/doc/formatmenu.html
+share/xdrawchem/doc/functions.html
+share/xdrawchem/doc/groupmenu.html
+share/xdrawchem/doc/helpmenu.html
+share/xdrawchem/doc/index.html
+share/xdrawchem/doc/italictool.png
+share/xdrawchem/doc/linetool.png
+share/xdrawchem/doc/molinfo.html
+share/xdrawchem/doc/pastetool.png
+share/xdrawchem/doc/ringtool.png
+share/xdrawchem/doc/ringtoolbar.png
+share/xdrawchem/doc/selecttool.png
+share/xdrawchem/doc/spectra.html
+share/xdrawchem/doc/subscript.png
+share/xdrawchem/doc/superscript.png
+share/xdrawchem/doc/symboltool.png
+share/xdrawchem/doc/text.html
+share/xdrawchem/doc/texttool.png
+share/xdrawchem/doc/thick_pulldown.png
+share/xdrawchem/doc/toolbar.html
+share/xdrawchem/doc/toolmenu.html
+share/xdrawchem/doc/underlinetool.png
+share/xdrawchem/doc/uptool.png
+share/xdrawchem/edans.cml
+share/xdrawchem/element.txt
+share/xdrawchem/extable.txt
+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/phmodel.txt
+share/xdrawchem/proline.cml
+share/xdrawchem/purine.cml
+share/xdrawchem/pyrimidine.cml
+share/xdrawchem/resdata.txt
+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/types.txt
+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
+ at dirrm share/xdrawchem/doc
+ at dirrm share/xdrawchem
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list