- 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

biology/xmolwt/Makefile

@@ -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

biology/xmolwt/files/patch-aa

@@ -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

biology/xmolwt/pkg-plist

@@ -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%%