From owner-freebsd-ports Mon Jun 17 13:21: 6 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A98FD37B41A for ; Mon, 17 Jun 2002 13:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5HKK1m21823; Mon, 17 Jun 2002 13:20:01 -0700 (PDT) (envelope-from gnats) Received: from nwww.freebsd.org (www.FreeBSD.org [216.136.204.117]) by hub.freebsd.org (Postfix) with ESMTP id C2A3C37B481 for ; Mon, 17 Jun 2002 13:17:43 -0700 (PDT) Received: from www.freebsd.org (localhost [127.0.0.1]) by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g5HKGdhG060471 for ; Mon, 17 Jun 2002 13:16:39 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.2/8.12.2/Submit) id g5HKGdH0060470; Mon, 17 Jun 2002 13:16:39 -0700 (PDT) Message-Id: <200206172016.g5HKGdH0060470@www.freebsd.org> Date: Mon, 17 Jun 2002 13:16:39 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/39426: Update port: biology/xdrawchem to 1.3.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 39426 >Category: ports >Synopsis: Update port: biology/xdrawchem to 1.3.2 >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 Jun 17 13:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.3.2 >How-To-Repeat: >Fix: diff -urN /usr/ports/biology/xdrawchem/Makefile biology/xdrawchem/Makefile --- /usr/ports/biology/xdrawchem/Makefile Wed Jan 30 19:21:22 2002 +++ biology/xdrawchem/Makefile Fri Jun 7 20:30:06 2002 @@ -6,23 +6,25 @@ # PORTNAME= xdrawchem -PORTVERSION= 0.99.7 +PORTVERSION= 1.3.2 CATEGORIES= biology MASTER_SITES= http://www.prism.gatech.edu/~gte067k/xdrawchem/ EXTRACT_SUFX= .tgz MAINTAINER= trevor@FreeBSD.org -MAKE_ENV= QTDIR="${X11BASE}" +MAKE_ENV= CXX="${CXX}" MOC="${MOC}" QTCPPFLAGS="${QTCPPFLAGS}" \ + QTCFGLIBS="${QTCFGLIBS}" LIBQT="-l${QTNAME}" PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes USE_QT_VER= 2 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 +.for ii in chemdata_rxn molecule_tools + cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -O0 -c -DUNIX ${QTCPPFLAGS} \ + -o ${ii}.o ${ii}.cpp +.endfor pre-install: ${ECHO_CMD} bin/xdrawchem > ${PLIST} diff -urN /usr/ports/biology/xdrawchem/distinfo biology/xdrawchem/distinfo --- /usr/ports/biology/xdrawchem/distinfo Mon Jan 21 20:21:18 2002 +++ biology/xdrawchem/distinfo Thu Jan 1 09:00:00 1970 @@ -1 +0,0 @@ -MD5 (xdrawchem-0.99.7.tgz) = b6ce1837704771e329055f283d814f35 diff -urN /usr/ports/biology/xdrawchem/files/patch-aa biology/xdrawchem/files/patch-aa --- /usr/ports/biology/xdrawchem/files/patch-aa Mon Jan 21 20:21:19 2002 +++ biology/xdrawchem/files/patch-aa Tue Jun 4 01:53:12 2002 @@ -1,27 +1,14 @@ ---- 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 :) +--- Makefile.orig Sun May 19 01:04:55 2002 ++++ Makefile Tue Jun 4 01:52:49 2002 +@@ -6,16 +6,16 @@ + # xdc_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\"" + xdc_server = herger.ibb.gatech.edu ## Platform-specific flags -- uncomment appropriate section ## For Linux, SGI IRIX 6.5 using gcc/g++ @@ -29,23 +16,33 @@ -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 ++#CXX = g++ ++#INCPATH = -I/usr/include -I$(QTDIR)/include ++#LIBS = -lqt -lXext -lX11 -lm ++#MOC = $(QTDIR)/bin/moc ## for Sun #CXX = CC -@@ -37,10 +36,9 @@ +@@ -25,17 +25,17 @@ + + ## For FreeBSD and NetBSD + #CXX = g++ +-#INCPATH = -I/usr/include -I/usr/X11R6/include/qt2 +-#LIBS = -lqt2 -lXext -lX11 -lm ++INCPATH = ${QTCPPFLAGS} ++LIBS = ${QTCFGLIBS} ${LIBQT} + #MOC = $(QTDIR)/bin/moc2 + ## end of platform-specific flags ## other compiler flags --CXXFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) +-CXXFLAGS = -g -DUNIX -DRINGHOME=\"${INSTRING}\" -DXDC_SERVER=\"${xdc_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 ++CXXFLAGS += -DUNIX -DRINGHOME=\"${INSTRING}\" -DXDC_SERVER=\"${xdc_server}\" ++CC ?= gcc + #CFLAGS = -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER) +-LFLAGS = -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib ++#LFLAGS = -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib ####### Target >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message