Alterations to use libungif instead of giflib

4 files changed, 72 insertions, 12 deletions

diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index c2c06952fad..2fd73770b12 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/10/07 17:41:53 tron Exp $
+# $NetBSD: Makefile,v 1.25 1999/10/09 20:14:08 jlam Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.2
@@ -11,18 +11,17 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 
 DEPENDS+=	kdebase-1.1.2:../../x11/kdebase
+DEPENDS+=	libungif-*:../../graphics/libungif
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
-		"--x-lib=${PREFIX}/lib -L${LOCALBASE}/lib" \
-		"--datadir=${PREFIX}/share/kde" \
+CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${PREFIX}" \
 		"--with-qt-includes=${PREFIX}/include/qt"
-CFLAGS+=	-I${LOCALBASE}/include/giflib -I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=  KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kdegraphics/files/patch-sum b/graphics/kdegraphics/files/patch-sum
index 3f8e139b788..1807ba7ccd4 100644
--- a/graphics/kdegraphics/files/patch-sum
+++ b/graphics/kdegraphics/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/09/30 07:50:00 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/10/09 20:14:09 jlam Exp $
 
 MD5 (patch-aa) = c13972030d3908c8eab78488960f06b9
-MD5 (patch-ab) = d6175035f2e158bb4d42ece06da834b8
+MD5 (patch-ab) = 72a89da589137f5495fdf6122226d97d
 MD5 (patch-ac) = fdbc331b1e85bdaefb7b1fdc06827c8e
 MD5 (patch-ad) = f972d1778a8b5b6fd2240f5d6a305ef4
 MD5 (patch-ae) = e23d09916b9b2068c17d3f318062619a
+MD5 (patch-af) = 1ba79b59ace728111f97c1b0b8ddd4d3
diff --git a/graphics/kdegraphics/patches/patch-ab b/graphics/kdegraphics/patches/patch-ab
index 951ee5a9f52..ccb7997186b 100644
--- a/graphics/kdegraphics/patches/patch-ab
+++ b/graphics/kdegraphics/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 1999/06/05 17:27:56 tron Exp $
+$NetBSD: patch-ab,v 1.3 1999/10/09 20:14:09 jlam Exp $
 
---- configure.orig	Wed Apr 28 17:23:40 1999
-+++ configure	Sat Jun  5 18:53:54 1999
+--- configure.orig	Tue Sep  7 11:22:53 1999
++++ configure	Sat Oct  9 14:08:37 1999
 @@ -511,9 +511,9 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 1999/06/05 17:27:56 tron Exp $
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -4050,37 +4050,37 @@
+@@ -4056,37 +4056,37 @@
  if test "$ac_use_path_checking" = "default"; then
  
    if test -z "$kde_htmldir"; then
@@ -63,3 +63,42 @@ $NetBSD: patch-ab,v 1.2 1999/06/05 17:27:56 tron Exp $
    fi
    if test -z "$kde_bindir"; then
      kde_bindir='\$(exec_prefix)/bin'
+@@ -4407,7 +4407,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
++LIBS="$all_libraries -lungif -lX11 $LIBSOCKET"
+ cat > conftest.$ac_ext <<EOF
+ #line 4413 "configure"
+ #include "confdefs.h"
+@@ -4428,7 +4428,7 @@
+ EOF
+ if { (eval echo configure:4430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+-  eval "ac_cv_lib_gif=yes"
++  eval "ac_cv_lib_gif=-lungif"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -4439,8 +4439,10 @@
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++if eval "test ! \"`echo $ac_cv_lib_gif`\" = no"; then
++  LIBGIF="$ac_cv_lib_gif"
++  
++  echo "$ac_t""$ac_cv_lib_gif" 1>&6
+   cat >> confdefs.h <<EOF
+ #define HAVE_LIBGIF 1
+ EOF
+@@ -5626,6 +5628,7 @@
+ s%@LIB_KAB@%$LIB_KAB%g
+ s%@LIB_MEDIATOOL@%$LIB_MEDIATOOL%g
+ s%@LIBKHTMLW@%$LIBKHTMLW%g
++s%@LIBGIF@%$LIBGIF%g
+ s%@LIBJPEG@%$LIBJPEG%g
+ s%@LIBZ@%$LIBZ%g
+ s%@LIBTIFF@%$LIBTIFF%g
diff --git a/graphics/kdegraphics/patches/patch-af b/graphics/kdegraphics/patches/patch-af
new file mode 100644
index 00000000000..a399cb62836
--- /dev/null
+++ b/graphics/kdegraphics/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 1999/10/09 20:14:09 jlam Exp $
+
+--- kpaint/Makefile.in.orig	Tue Sep  7 11:22:50 1999
++++ kpaint/Makefile.in	Sat Oct  9 14:04:18 1999
+@@ -83,6 +83,7 @@
+ LIBCOMPAT = @LIBCOMPAT@
+ LIBCRYPT = @LIBCRYPT@
+ LIBDL = @LIBDL@
++LIBGIF = @LIBGIF@
+ LIBJPEG = @LIBJPEG@
+ LIBKHTMLW = @LIBKHTMLW@
+ LIBMICO = @LIBMICO@
+@@ -161,7 +162,7 @@
+ 
+ INCLUDES = $(all_includes)
+ LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-LDADD = $(LIB_KIMGIO) -lgif -lm $(LIB_KFILE)
++LDADD = $(LIB_KIMGIO) $(LIBGIF) -lm $(LIB_KFILE)
+ 
+ appsdir = $(kde_appsdir)/Graphics
+ apps_DATA = kpaint.kdelnk