From 97830337b8c0333a12d15a49ea1f9c9cdc3dfddf Mon Sep 17 00:00:00 2001
From: reg <reg@FreeBSD.org>
Date: Thu, 5 Oct 2000 06:36:23 +0000
Subject: Implement USE_GTK, part 1.

---
 devel/gtksheet/Makefile       |  5 +----
 devel/gtksheet/files/patch-aa |  2 +-
 devel/mico/Makefile           | 20 ++++++++------------
 devel/mico/pkg-plist          |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'devel')

diff --git a/devel/gtksheet/Makefile b/devel/gtksheet/Makefile
index cd6f902..77038ad 100644
--- a/devel/gtksheet/Makefile
+++ b/devel/gtksheet/Makefile
@@ -12,11 +12,8 @@ MASTER_SITES=	http://magnet.fsu.edu/~feiguin/gtk/src/
 
 MAINTAINER=	ijliao@csie.nctu.edu.tw
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
 USE_X_PREFIX=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-MAKE_ENV+=	GTK_CONFIG=${GTK_CONFIG}
+USE_GTK=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libgtksheet.a ${PREFIX}/lib
diff --git a/devel/gtksheet/files/patch-aa b/devel/gtksheet/files/patch-aa
index 589d770..8fcb2ab 100644
--- a/devel/gtksheet/files/patch-aa
+++ b/devel/gtksheet/files/patch-aa
@@ -7,7 +7,7 @@
 -LIBDIRS = $(shell gtk-config --libs)
 -CFLAGS = -Wall $(shell gtk-config --cflags)
 +LIBDIRS = `$(GTK_CONFIG) --libs`
-+CFLAGS = -Wall `$(GTK_CONFIG) --cflags`
++CFLAGS += -Wall `$(GTK_CONFIG) --cflags`
  
  all:    demo libGtkSheet.a 
  
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index cdafde1..43d9234 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -12,15 +12,11 @@ MASTER_SITES=	http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
 
 MAINTAINER=	scrappy@freebsd.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		tcl82.1:${PORTSDIR}/lang/tcl82
+LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
-MICOVER=	`${ECHO} ${DISTNAME} | ${SED} 's/mico-//'`
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+WRKSRC=		${WRKDIR}/mico
 
-INSTALLS_SHLIB=	yes
-USE_NEWGCC=	yes
+MICOVER=	`${ECHO} ${DISTNAME} | ${SED} 's/mico-//'`
 
 .if defined(QT2)
 USE_QT2=	yes
@@ -34,14 +30,13 @@ MAKE_ENV=	QT_INCLUDES="${X11BASE}/include/X11/qt" \
 CONFIGURE_ENV=	QTVER=""
 .endif
 
-USE_AUTOCONF=	yes
+INSTALLS_SHLIB=	yes
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
-
-WRKSRC=		${WRKDIR}/mico
-
+USE_GTK=	yes
+USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-qt --with-gtk --with-tcl --disable-mini-stl \
 		--enable-static --enable-shared
-CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}"
 
 PLIST_SUB=	MICOVER="${MICOVER}"
 
@@ -52,6 +47,7 @@ MAN8=		ird.8 micod.8 nsd.8
 post-install:
 	${LN} -sf ${PREFIX}/lib/libmico${MICOVER}.so.1 ${PREFIX}/lib/libmico.${MICOVER}.so
 	${LN} -sf ${PREFIX}/lib/libmicoaux${MICOVER}.so.1 ${PREFIX}/lib/libmicoaux.${MICOVER}.so
+	${LN} -sf ${PREFIX}/lib/libmicocoss${MICOVER}.so.1 ${PREFIX}/lib/libmicocoss.${MICOVER}.so
 	${LN} -sf ${PREFIX}/lib/libmicogtk${MICOVER}.so.1 ${PREFIX}/lib/libmicogtk.${MICOVER}.so
 	${LN} -sf ${PREFIX}/lib/libmicoqt${MICOVER}.so.1 ${PREFIX}/lib/libmicoqt.${MICOVER}.so
 	${LN} -sf ${PREFIX}/lib/libmicotcl${MICOVER}.so.1 ${PREFIX}/lib/libmicotcl.${MICOVER}.so
diff --git a/devel/mico/pkg-plist b/devel/mico/pkg-plist
index f227b1d..02abf5d 100644
--- a/devel/mico/pkg-plist
+++ b/devel/mico/pkg-plist
@@ -211,6 +211,7 @@ lib/libmico%%MICOVER%%.so.1
 lib/libmicoaux.%%MICOVER%%.so
 lib/libmicoaux%%MICOVER%%.a
 lib/libmicoaux%%MICOVER%%.so.1
+lib/libmicocoss.%%MICOVER%%.so
 lib/libmicocoss%%MICOVER%%.a
 lib/libmicocoss%%MICOVER%%.so.1
 lib/libmicogtk.%%MICOVER%%.so
@@ -610,4 +611,3 @@ share/doc/mico/manual.ps
 @dirrm share/doc/mico
 @dirrm include/ministl
 @dirrm include/mico
-
-- 
cgit v1.1