Implement USE_GTK, part 1.

3 files changed, 26 insertions, 38 deletions

diff --git a/biology/gperiodic/Makefile b/biology/gperiodic/Makefile
index 131cbfa6a33a..2a9540aec05a 100644
--- a/biology/gperiodic/Makefile
+++ b/biology/gperiodic/Makefile
@@ -12,25 +12,23 @@ MASTER_SITES=	ftp://ftp.seul.org/pub/gperiodic/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/gperiodic
 
-MAN1=		gperiodic.1
-
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+MAN1=		gperiodic.1
 
 post-install:
-	@ ${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/gperiodic.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/gperiodic
+	@${MKDIR} ${PREFIX}/share/doc/gperiodic
 .for file in AUTHORS COPYING Changes README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gperiodic
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gperiodic
 .endfor
 .endif
 
diff --git a/biology/xmolwt/Makefile b/biology/xmolwt/Makefile
index 10eee7611305..3b27381ba7d0 100644
--- a/biology/xmolwt/Makefile
+++ b/biology/xmolwt/Makefile
@@ -11,15 +11,11 @@ MASTER_SITES=	http://www.st.hirosaki-u.ac.jp/~rmiya/xmolwt/
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
+MAKEFILE=	Makefile.gtk
 
 USE_GMAKE=	yes
-MAKEFILE=	Makefile.gtk
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gmolwt ${PREFIX}/bin
diff --git a/biology/xmolwt/files/patch-aa b/biology/xmolwt/files/patch-aa
index 5c212be43bf7..3fb0ba1392eb 100644
--- a/biology/xmolwt/files/patch-aa
+++ b/biology/xmolwt/files/patch-aa
@@ -1,21 +1,15 @@
-*** Makefile.gtk.orig	Sat Aug 28 19:46:47 1999
---- Makefile.gtk	Sat Jul  1 15:49:31 2000
-***************
-*** 1,7 ****
-! CC = gcc
-! CFLAGS = -DGTK
-! GTKCONFIG = gtk12-config
-  OBJS = molwt.o usage.o element.o reduce.o count.o calculate.o initwidget.o allowcase.o inputformula.o addtolist.o
-  
-  molwt: gmolwt
-  	ln -s gmolwt molwt
---- 1,9 ----
-! CC ?= gcc
-! CFLAGS += -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
-+ 
-+ all: gmolwt
-  
-  molwt: gmolwt
-  	ln -s gmolwt molwt
+--- Makefile.gtk.orig	Sat Aug 28 03:46:47 1999
++++ Makefile.gtk	Sun Sep 24 00:20:45 2000
+@@ -1,7 +1,9 @@
+-CC = gcc
+-CFLAGS = -DGTK
+-GTKCONFIG = gtk12-config
++CC ?= gcc
++CFLAGS += -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
++
++all: gmolwt
+ 
+ molwt: gmolwt
+ 	ln -s gmolwt molwt