aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>1999-01-22 10:13:38 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>1999-01-22 10:13:38 +0000
commit3ea400c2e1f94f6481580ea53c2568b565ef39cd (patch)
tree4e329f161cb6661daeff04b86f83e3338866115d /x11
parent95573c6baf8dd3027be64ec652fa3ec9b0deca91 (diff)
downloadports-3ea400c2e1f94f6481580ea53c2568b565ef39cd.tar.gz
ports-3ea400c2e1f94f6481580ea53c2568b565ef39cd.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-libs/Makefile26
-rw-r--r--x11/gnome-libs/distinfo2
-rw-r--r--x11/gnome-libs/files/patch-aa46
-rw-r--r--x11/gnome-libs/pkg-plist2
-rw-r--r--x11/gnomelibs/Makefile26
-rw-r--r--x11/gnomelibs/distinfo2
-rw-r--r--x11/gnomelibs/files/patch-aa46
-rw-r--r--x11/gnomelibs/pkg-plist2
-rw-r--r--x11/libgnome/Makefile26
-rw-r--r--x11/libgnome/distinfo2
-rw-r--r--x11/libgnome/files/patch-aa46
-rw-r--r--x11/libgnome/pkg-plist2
12 files changed, 90 insertions, 138 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e48de34a0c1a..37cf41bb822c 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,14 +1,14 @@
-# New ports collection makefile for: gnomelibs
-# Version required: 0.99.3
-# Date created: 17 June 1998
-# Whom: Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for: gnomelibs
+# Version required: 0.99.4
+# Date created: 17 June 1998
+# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.25 1999/01/14 16:59:32 vanilla Exp $
+# $Id: Makefile,v 1.26 1999/01/14 18:54:49 vanilla Exp $
#
-DISTNAME= gnome-libs-0.99.3
-PKGNAME= gnomelibs-0.99.3
-CATEGORIES= x11
+DISTNAME= gnome-libs-0.99.4
+PKGNAME= gnomelibs-0.99.4
+CATEGORIES= x11 gnome
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
@@ -29,11 +29,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \
esd.1:${PORTSDIR}/audio/esound
USE_X_PREFIX= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 300000
USE_PERL5= yes
-.endif
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
@@ -43,13 +39,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-pre-build:
- ( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
-
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 5881bdaf779d..95f35af40ccc 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.3.tar.gz) = c93b22148650f9bca02cc066aebcbcf4
+MD5 (gnome-libs-0.99.4.tar.gz) = c1ef70b1ff9d67e60ddd2f5a0f2f90b1
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 1ea9e366b28b..f12ac53bac78 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,12 +1,6 @@
---- configure.orig Wed Jan 13 09:30:53 1999
-+++ configure Fri Jan 15 00:03:57 1999
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version 2.12
-@@ -4727,7 +4727,9 @@
+--- configure.orig Tue Jan 19 07:04:57 1999
++++ configure Thu Jan 21 14:27:55 1999
+@@ -4873,7 +4873,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14,10 +8,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lintl $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 4732 "configure"
+ #line 4878 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5905,7 +5907,9 @@
+@@ -6059,7 +6061,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -25,10 +19,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 5910 "configure"
+ #line 6064 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5960,8 +5964,8 @@
+@@ -6114,8 +6118,8 @@
#include "confdefs.h"
#include <stdio.h>
@@ -38,58 +32,58 @@
int main() {
-@@ -6407,7 +6411,7 @@
+@@ -6613,7 +6617,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 6413 "configure"
+ #line 6619 "configure"
#include "confdefs.h"
-@@ -6661,16 +6665,16 @@
+@@ -6867,16 +6871,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6667: checking for gif_lib.h" >&5
+-echo "configure:6873: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6667: checking for giflib/gif_lib.h" >&5
++echo "configure:6873: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6672 "configure"
+ #line 6878 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6737,16 +6741,16 @@
+ { (eval echo configure:6883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6943,16 +6947,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6743: checking for gif_lib.h" >&5
+-echo "configure:6949: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6743: checking for giflib/gif_lib.h" >&5
++echo "configure:6949: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6748 "configure"
+ #line 6954 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -9674,7 +9678,7 @@
+ { (eval echo configure:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -9892,7 +9896,7 @@
ZVT_LIBS="-lzvt $GTK_LIBS"
GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bdc9515a7d43..e59a14ca7e4c 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -1,4 +1,3 @@
-bin/convertrgb
bin/gconfigger
bin/gnome-config
bin/gnome-dump-metadata
@@ -206,7 +205,6 @@ share/locale/ca/LC_MESSAGES/gnome-libs.mo
share/locale/cs/LC_MESSAGES/gnome-libs.mo
share/locale/da/LC_MESSAGES/gnome-libs.mo
share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
share/locale/fi/LC_MESSAGES/gnome-libs.mo
share/locale/fr/LC_MESSAGES/gnome-libs.mo
share/locale/ga/LC_MESSAGES/gnome-libs.mo
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index e48de34a0c1a..37cf41bb822c 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,14 +1,14 @@
-# New ports collection makefile for: gnomelibs
-# Version required: 0.99.3
-# Date created: 17 June 1998
-# Whom: Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for: gnomelibs
+# Version required: 0.99.4
+# Date created: 17 June 1998
+# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.25 1999/01/14 16:59:32 vanilla Exp $
+# $Id: Makefile,v 1.26 1999/01/14 18:54:49 vanilla Exp $
#
-DISTNAME= gnome-libs-0.99.3
-PKGNAME= gnomelibs-0.99.3
-CATEGORIES= x11
+DISTNAME= gnome-libs-0.99.4
+PKGNAME= gnomelibs-0.99.4
+CATEGORIES= x11 gnome
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
@@ -29,11 +29,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \
esd.1:${PORTSDIR}/audio/esound
USE_X_PREFIX= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 300000
USE_PERL5= yes
-.endif
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
@@ -43,13 +39,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-pre-build:
- ( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
-
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index 5881bdaf779d..95f35af40ccc 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.3.tar.gz) = c93b22148650f9bca02cc066aebcbcf4
+MD5 (gnome-libs-0.99.4.tar.gz) = c1ef70b1ff9d67e60ddd2f5a0f2f90b1
diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index 1ea9e366b28b..f12ac53bac78 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,12 +1,6 @@
---- configure.orig Wed Jan 13 09:30:53 1999
-+++ configure Fri Jan 15 00:03:57 1999
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version 2.12
-@@ -4727,7 +4727,9 @@
+--- configure.orig Tue Jan 19 07:04:57 1999
++++ configure Thu Jan 21 14:27:55 1999
+@@ -4873,7 +4873,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14,10 +8,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lintl $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 4732 "configure"
+ #line 4878 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5905,7 +5907,9 @@
+@@ -6059,7 +6061,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -25,10 +19,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 5910 "configure"
+ #line 6064 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5960,8 +5964,8 @@
+@@ -6114,8 +6118,8 @@
#include "confdefs.h"
#include <stdio.h>
@@ -38,58 +32,58 @@
int main() {
-@@ -6407,7 +6411,7 @@
+@@ -6613,7 +6617,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 6413 "configure"
+ #line 6619 "configure"
#include "confdefs.h"
-@@ -6661,16 +6665,16 @@
+@@ -6867,16 +6871,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6667: checking for gif_lib.h" >&5
+-echo "configure:6873: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6667: checking for giflib/gif_lib.h" >&5
++echo "configure:6873: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6672 "configure"
+ #line 6878 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6737,16 +6741,16 @@
+ { (eval echo configure:6883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6943,16 +6947,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6743: checking for gif_lib.h" >&5
+-echo "configure:6949: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6743: checking for giflib/gif_lib.h" >&5
++echo "configure:6949: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6748 "configure"
+ #line 6954 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -9674,7 +9678,7 @@
+ { (eval echo configure:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -9892,7 +9896,7 @@
ZVT_LIBS="-lzvt $GTK_LIBS"
GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index bdc9515a7d43..e59a14ca7e4c 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -1,4 +1,3 @@
-bin/convertrgb
bin/gconfigger
bin/gnome-config
bin/gnome-dump-metadata
@@ -206,7 +205,6 @@ share/locale/ca/LC_MESSAGES/gnome-libs.mo
share/locale/cs/LC_MESSAGES/gnome-libs.mo
share/locale/da/LC_MESSAGES/gnome-libs.mo
share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
share/locale/fi/LC_MESSAGES/gnome-libs.mo
share/locale/fr/LC_MESSAGES/gnome-libs.mo
share/locale/ga/LC_MESSAGES/gnome-libs.mo
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index e48de34a0c1a..37cf41bb822c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,14 +1,14 @@
-# New ports collection makefile for: gnomelibs
-# Version required: 0.99.3
-# Date created: 17 June 1998
-# Whom: Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for: gnomelibs
+# Version required: 0.99.4
+# Date created: 17 June 1998
+# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.25 1999/01/14 16:59:32 vanilla Exp $
+# $Id: Makefile,v 1.26 1999/01/14 18:54:49 vanilla Exp $
#
-DISTNAME= gnome-libs-0.99.3
-PKGNAME= gnomelibs-0.99.3
-CATEGORIES= x11
+DISTNAME= gnome-libs-0.99.4
+PKGNAME= gnomelibs-0.99.4
+CATEGORIES= x11 gnome
MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \
ftp://ftp.geo.net/pub/gnome/sources/latest/ \
ftp://gnomeftp.wgn.net/pub/gnome/sources/latest/ \
@@ -29,11 +29,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \
esd.1:${PORTSDIR}/audio/esound
USE_X_PREFIX= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 300000
USE_PERL5= yes
-.endif
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
@@ -43,13 +39,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-pre-build:
- ( cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h )
-
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 5881bdaf779d..95f35af40ccc 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.3.tar.gz) = c93b22148650f9bca02cc066aebcbcf4
+MD5 (gnome-libs-0.99.4.tar.gz) = c1ef70b1ff9d67e60ddd2f5a0f2f90b1
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index 1ea9e366b28b..f12ac53bac78 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,12 +1,6 @@
---- configure.orig Wed Jan 13 09:30:53 1999
-+++ configure Fri Jan 15 00:03:57 1999
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version 2.12
-@@ -4727,7 +4727,9 @@
+--- configure.orig Tue Jan 19 07:04:57 1999
++++ configure Thu Jan 21 14:27:55 1999
+@@ -4873,7 +4873,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14,10 +8,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lintl $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 4732 "configure"
+ #line 4878 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5905,7 +5907,9 @@
+@@ -6059,7 +6061,9 @@
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -25,10 +19,10 @@
+ ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
- #line 5910 "configure"
+ #line 6064 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
-@@ -5960,8 +5964,8 @@
+@@ -6114,8 +6118,8 @@
#include "confdefs.h"
#include <stdio.h>
@@ -38,58 +32,58 @@
int main() {
-@@ -6407,7 +6411,7 @@
+@@ -6613,7 +6617,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 6413 "configure"
+ #line 6619 "configure"
#include "confdefs.h"
-@@ -6661,16 +6665,16 @@
+@@ -6867,16 +6871,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6667: checking for gif_lib.h" >&5
+-echo "configure:6873: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6667: checking for giflib/gif_lib.h" >&5
++echo "configure:6873: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6672 "configure"
+ #line 6878 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6737,16 +6741,16 @@
+ { (eval echo configure:6883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6943,16 +6947,16 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6743: checking for gif_lib.h" >&5
+-echo "configure:6949: checking for gif_lib.h" >&5
+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6743: checking for giflib/gif_lib.h" >&5
++echo "configure:6949: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
- #line 6748 "configure"
+ #line 6954 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -9674,7 +9678,7 @@
+ { (eval echo configure:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -9892,7 +9896,7 @@
ZVT_LIBS="-lzvt $GTK_LIBS"
GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index bdc9515a7d43..e59a14ca7e4c 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,4 +1,3 @@
-bin/convertrgb
bin/gconfigger
bin/gnome-config
bin/gnome-dump-metadata
@@ -206,7 +205,6 @@ share/locale/ca/LC_MESSAGES/gnome-libs.mo
share/locale/cs/LC_MESSAGES/gnome-libs.mo
share/locale/da/LC_MESSAGES/gnome-libs.mo
share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
share/locale/fi/LC_MESSAGES/gnome-libs.mo
share/locale/fr/LC_MESSAGES/gnome-libs.mo
share/locale/ga/LC_MESSAGES/gnome-libs.mo