Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Dec 2012 22:22:07 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308453 - in head/biology/xmolwt: . files
Message-ID:  <201212072222.qB7MM727097056@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Dec  7 22:22:06 2012
New Revision: 308453
URL: http://svnweb.freebsd.org/changeset/ports/308453

Log:
  - Support CC properly
  - Switch to PLIST_FILES
  - Add option for GTK2 support
  
  PR:		ports/174174
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Deleted:
  head/biology/xmolwt/files/
  head/biology/xmolwt/pkg-plist
Modified:
  head/biology/xmolwt/Makefile

Modified: head/biology/xmolwt/Makefile
==============================================================================
--- head/biology/xmolwt/Makefile	Fri Dec  7 21:49:46 2012	(r308452)
+++ head/biology/xmolwt/Makefile	Fri Dec  7 22:22:06 2012	(r308453)
@@ -1,23 +1,41 @@
-# New ports collection makefile for:	xmolwt/gmolwt
-# Date created:		1999-08-30
-# Whom:			Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
-#
+# Created by: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>
 # $FreeBSD$
 
 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
+COMMENT=	Calculate atom 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 <bsd.port.options.mk>
+
+.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212072222.qB7MM727097056>