aboutsummaryrefslogtreecommitdiffstats
path: root/biology
diff options
context:
space:
mode:
authorpawel <pawel@FreeBSD.org>2012-12-08 06:22:06 +0800
committerpawel <pawel@FreeBSD.org>2012-12-08 06:22:06 +0800
commit1ba260038cb40b201702711aa35341b8f9a157d6 (patch)
tree7c31c9ed75740bf1f36f07de0b10b9515d874eba /biology
parent5d6e8f934cef0ebdc5faf42ede94779049e5fe5f (diff)
downloadfreebsd-ports-gnome-1ba260038cb40b201702711aa35341b8f9a157d6.tar.gz
freebsd-ports-gnome-1ba260038cb40b201702711aa35341b8f9a157d6.tar.zst
freebsd-ports-gnome-1ba260038cb40b201702711aa35341b8f9a157d6.zip
- 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
Diffstat (limited to 'biology')
-rw-r--r--biology/xmolwt/Makefile34
-rw-r--r--biology/xmolwt/files/patch-aa16
-rw-r--r--biology/xmolwt/pkg-plist11
3 files changed, 26 insertions, 35 deletions
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 48c7333f13f7..0fe0de72a8ed 100644
--- a/biology/xmolwt/Makefile
+++ b/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
diff --git a/biology/xmolwt/files/patch-aa b/biology/xmolwt/files/patch-aa
deleted file mode 100644
index 8bf262c98712..000000000000
--- a/biology/xmolwt/files/patch-aa
+++ /dev/null
@@ -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 --git a/biology/xmolwt/pkg-plist b/biology/xmolwt/pkg-plist
deleted file mode 100644
index 2d16b3c96b17..000000000000
--- a/biology/xmolwt/pkg-plist
+++ /dev/null
@@ -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%%