From dea7aac5809520aef84a8c2c1a22ea1474868313 Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@FreeBSD.org>
Date: Thu, 22 Aug 2002 08:26:24 +0000
Subject: Fix build.

PR: 41362
Submitted by: Ports Fury
---
 x11-wm/e16utils/Makefile                    |  5 +++--
 x11-wm/e16utils/files/patch-e16keyedit-0.2  | 15 +++++++++------
 x11-wm/e16utils/files/patch-e16menuedit-0.1 | 15 +++++++++------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 17929f782a64..d0b4c914c20a 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	imlib
 
 SUB_STUBS=	e16menuedit-0.1 e16keyedit-0.2
 
@@ -29,7 +30,7 @@ do-patch:
 
 do-build:
 .for i in ${SUB_STUBS}
-	@cd ${WRKDIR}/${i} ; ${SETENV} GTK_CONFIG=${GTK_CONFIG} make all
+	@cd ${WRKDIR}/${i} ; ${SETENV} ${MAKE_ENV} ${MAKE} all
 .endfor
 
 do-install:
diff --git a/x11-wm/e16utils/files/patch-e16keyedit-0.2 b/x11-wm/e16utils/files/patch-e16keyedit-0.2
index e23421d7e3e2..ddb211f1fc68 100644
--- a/x11-wm/e16utils/files/patch-e16keyedit-0.2
+++ b/x11-wm/e16utils/files/patch-e16keyedit-0.2
@@ -1,7 +1,8 @@
+
 $FreeBSD$
 
---- Makefile.orig	Thu Mar 23 13:04:16 2000
-+++ Makefile	Tue Oct 17 17:17:01 2000
+--- Makefile.orig	Fri Mar 24 04:04:16 2000
++++ Makefile	Sat Aug  3 02:32:20 2002
 @@ -10,23 +10,23 @@
  BUILD    = \
  
@@ -12,16 +13,18 @@ $FreeBSD$
 -    `gtk-config --libs` -lgdbm -lgdk_imlib
 -CFLAGS   = \
 -    -O -g -D_GNU_SOURCE $(DEVFLAGS)
-+    `${GTK_CONFIG} --libs` -lgdbm -lgdk_imlib -lImlib
++    `${IMLIB_CONFIG} --libs-gdk` -lgdbm
 +CFLAGS   += \
 +    -D_GNU_SOURCE $(DEVFLAGS)
  #CFLAGS   = \
  #    -O -g -W -Wall -Wno-unused  -pedantic -pedantic-errors -ansi -D_GNU_SOURCE
- OPTFLAGS   = \
-     -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
+-OPTFLAGS   = \
+-    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
++#OPTFLAGS   = \
++#    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
  INCLUDES = \
 -    `gtk-config --cflags` -I..
-+    `${GTK_CONFIG} --cflags` -I..
++    `${IMLIB_CONFIG} --cflags-gdk` -I..
  
  BIN      = e16keyedit
  
diff --git a/x11-wm/e16utils/files/patch-e16menuedit-0.1 b/x11-wm/e16utils/files/patch-e16menuedit-0.1
index 66ea97fcde8d..7768140b44c4 100644
--- a/x11-wm/e16utils/files/patch-e16menuedit-0.1
+++ b/x11-wm/e16utils/files/patch-e16menuedit-0.1
@@ -1,7 +1,8 @@
+
 $FreeBSD$
 
---- Makefile.orig	Sun Apr 16 15:40:03 2000
-+++ Makefile	Tue Oct 17 18:06:00 2000
+--- Makefile.orig	Mon Apr 17 05:40:03 2000
++++ Makefile	Sat Aug  3 02:33:28 2002
 @@ -10,23 +10,23 @@
  BUILD    = \
  
@@ -12,16 +13,18 @@ $FreeBSD$
 -    `gtk-config --libs` -lgdbm -lgdk_imlib
 -CFLAGS   = \
 -    -O -g -D_GNU_SOURCE $(DEVFLAGS)
-+    `${GTK_CONFIG} --libs` -lgdbm -lgdk_imlib -lImlib
++    `${IMLIB_CONFIG} --libs-gdk` -lgdbm
 +CFLAGS   += \
 +    -D_GNU_SOURCE $(DEVFLAGS)
  #CFLAGS   = \
  #    -O -g -W -Wall -Wno-unused  -pedantic -pedantic-errors -ansi -D_GNU_SOURCE
- OPTFLAGS   = \
-     -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
+-OPTFLAGS   = \
+-    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
++#OPTFLAGS   = \
++#    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
  INCLUDES = \
 -    `gtk-config --cflags` -I..
-+    `${GTK_CONFIG} --cflags` -I..
++    `${IMLIB_CONFIG} --cflags-gdk` -I..
  
  BIN      = e16menuedit
  
-- 
cgit