From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 5 18:10:05 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DDEE0330 for ; Wed, 5 Dec 2012 18:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B66558FC1C for ; Wed, 5 Dec 2012 18:10:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qB5IA5pY033512 for ; Wed, 5 Dec 2012 18:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB5IA5uS033511; Wed, 5 Dec 2012 18:10:05 GMT (envelope-from gnats) Resent-Date: Wed, 5 Dec 2012 18:10:05 GMT Resent-Message-Id: <201212051810.qB5IA5uS033511@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 729EA1F0 for ; Wed, 5 Dec 2012 18:00:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165]) by mx1.freebsd.org (Postfix) with ESMTP id 4051C8FC12 for ; Wed, 5 Dec 2012 18:00:49 +0000 (UTC) Received: from localhost.localdomain (ZT034046.ppp.dion.ne.jp [59.128.34.46]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id 790CF4AC036 for ; Thu, 6 Dec 2012 03:00:47 +0900 (JST) Message-Id: <20121206023101.8bca0c2ca3bf87182929a04c@yahoo.com> Date: Thu, 6 Dec 2012 02:31:01 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174174: biology/xmolwt: Support CC properly X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Dec 2012 18:10:05 -0000 >Number: 174174 >Category: ports >Synopsis: biology/xmolwt: Support CC properly >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: Wed Dec 05 18:10:05 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p11 i386 >Organization: >Environment: >Description: - Support CC properly - Support PLIST_FILES - Add option for GTK2 support Remove file: pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/biology/xmolwt/Makefile biology/xmolwt/Makefile --- /usr/ports/biology/xmolwt/Makefile 2012-11-08 06:53:04.000000000 +0900 +++ biology/xmolwt/Makefile 2012-12-03 23:36:47.000000000 +0900 @@ -1,23 +1,41 @@ -# New ports collection makefile for: xmolwt/gmolwt -# Date created: 1999-08-30 -# Whom: Ryo MIYAMOTO -# +# Created by: Ryo MIYAMOTO # $FreeBSD: head/biology/xmolwt/Makefile 300895 2012-07-14 12:56:14Z beat $ PORTNAME= xmolwt PORTVERSION= 0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= biology MASTER_SITES= http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/ MAINTAINER= ports@FreeBSD.org COMMENT= Calculate formula weight and percent of each element for a given formula -WRKSRC= ${WRKDIR}/${DISTNAME} -MAKEFILE= Makefile.gtk +OPTIONS_DEFINE= GTK2 USE_GMAKE= yes +MAKEFILE= Makefile.gtk +ALL_TARGET= gmolwt +MAKE_JOBS_SAFE= yes + +PORTDOCS= * +PLIST_FILES= bin/gmolwt bin/molwt + +.include + +.if ${PORT_OPTIONS:MGTK2} +USE_GNOME= gtk20 +USE_PKGCONFIG= build +MAKE_ENV+= GTKCONFIG="pkg-config gtk+-2.0" +.else USE_GNOME= gtk12 +MAKE_ENV+= GTKCONFIG="${GTK_CONFIG}" +.endif + +post-patch: + @${REINPLACE_CMD} -e \ + '/^CC/s| =| ?=| ; \ + /^CFLAGS/s| =| +=| ; \ + /^GTKCONFIG/s| =| ?=|' ${WRKSRC}/Makefile.gtk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gmolwt ${PREFIX}/bin diff -urN /usr/ports/biology/xmolwt/files/patch-aa biology/xmolwt/files/patch-aa --- /usr/ports/biology/xmolwt/files/patch-aa 2012-11-08 06:53:04.000000000 +0900 +++ biology/xmolwt/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -1,16 +0,0 @@ ---- Makefile.gtk.orig Mon Mar 12 16:24:08 2001 -+++ Makefile.gtk Tue Mar 13 02:31:51 2001 -@@ -1,9 +1,11 @@ - # $Id: Makefile.gtk,v 1.3 2001/03/12 07:24:08 rmiya Exp $ - CC = gcc --CFLAGS = -Wall -DGTK --GTKCONFIG = gtk12-config -+CFLAGS += -Wall -DGTK -+GTKCONFIG = $(GTK_CONFIG) - OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o \ - initwidget.o allowcase.o inputformula.o addtolist.o atomicnumber.o -+ -+all: gmolwt - - molwt: gmolwt - rm -f molwt diff -urN /usr/ports/biology/xmolwt/pkg-plist biology/xmolwt/pkg-plist --- /usr/ports/biology/xmolwt/pkg-plist 2012-11-08 06:53:04.000000000 +0900 +++ biology/xmolwt/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ -bin/gmolwt -bin/molwt -%%PORTDOCS%%%%DOCSDIR%%/Howtouse.jp -%%PORTDOCS%%%%DOCSDIR%%/Readme -%%PORTDOCS%%%%DOCSDIR%%/Xmolwt -%%PORTDOCS%%%%DOCSDIR%%/dot.gtkrc -%%PORTDOCS%%%%DOCSDIR%%/gmolwt.gif -%%PORTDOCS%%%%DOCSDIR%%/xmolwt-e.html -%%PORTDOCS%%%%DOCSDIR%%/xmolwt.gif -%%PORTDOCS%%%%DOCSDIR%%/xmolwt.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: