mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
Imlib depend gtk11 now.
This commit is contained in:
Vanilla I. Shu
parent
37c4cb74f3
commit
2fdc2d5e53
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=12820
@ -3,7 +3,7 @@
|
||||
# Date created: 10 June 1997
|
||||
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
|
||||
#
|
||||
# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
|
||||
# $Id: Makefile,v 1.26 1998/08/07 23:56:26 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= imlib-1.7
|
||||
@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
|
||||
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
|
||||
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
|
||||
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
|
||||
gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
|
||||
gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
|
||||
@ -1,5 +1,84 @@
|
||||
--- configure.orig Sat Jul 18 10:57:31 1998
|
||||
+++ configure Sun Jul 19 01:53:34 1998
|
||||
+++ configure Mon Aug 24 10:04:27 1998
|
||||
@@ -1482,18 +1482,18 @@
|
||||
if test x$gtk_config_exec_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
if test x$gtk_config_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
|
||||
- # Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
-set dummy gtk-config; ac_word=$2
|
||||
+ # Extract the first word of "gtk11-config", so it can be a program name with args.
|
||||
+set dummy gtk11-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1499: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
@@ -1574,16 +1574,16 @@
|
||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
||||
(gtk_micro_version != $gtk_config_micro_version))
|
||||
{
|
||||
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
+ printf ("*** was found! If gtk11-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
|
||||
printf("*** before re-running configure\n");
|
||||
}
|
||||
else
|
||||
@@ -1603,10 +1603,10 @@
|
||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
@@ -1637,10 +1637,10 @@
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
- echo "*** The gtk-config script installed by GTK could not be found"
|
||||
+ echo "*** The gtk11-config script installed by GTK could not be found"
|
||||
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
- echo "*** full path to gtk-config."
|
||||
+ echo "*** full path to gtk11-config."
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
@@ -1682,7 +1682,7 @@
|
||||
echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
|
||||
+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG"
|
||||
fi
|
||||
rm -f conftest*
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
@@ -1699,143 +1699,6 @@
|
||||
rm -f conf.gtktest
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Date created: 10 June 1997
|
||||
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
|
||||
#
|
||||
# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
|
||||
# $Id: Makefile,v 1.26 1998/08/07 23:56:26 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= imlib-1.7
|
||||
@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
|
||||
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
|
||||
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
|
||||
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
|
||||
gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
|
||||
gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
|
||||
@ -1,5 +1,84 @@
|
||||
--- configure.orig Sat Jul 18 10:57:31 1998
|
||||
+++ configure Sun Jul 19 01:53:34 1998
|
||||
+++ configure Mon Aug 24 10:04:27 1998
|
||||
@@ -1482,18 +1482,18 @@
|
||||
if test x$gtk_config_exec_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
if test x$gtk_config_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
|
||||
- # Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
-set dummy gtk-config; ac_word=$2
|
||||
+ # Extract the first word of "gtk11-config", so it can be a program name with args.
|
||||
+set dummy gtk11-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1499: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
@@ -1574,16 +1574,16 @@
|
||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
||||
(gtk_micro_version != $gtk_config_micro_version))
|
||||
{
|
||||
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
+ printf ("*** was found! If gtk11-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
|
||||
printf("*** before re-running configure\n");
|
||||
}
|
||||
else
|
||||
@@ -1603,10 +1603,10 @@
|
||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
@@ -1637,10 +1637,10 @@
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
- echo "*** The gtk-config script installed by GTK could not be found"
|
||||
+ echo "*** The gtk11-config script installed by GTK could not be found"
|
||||
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
- echo "*** full path to gtk-config."
|
||||
+ echo "*** full path to gtk11-config."
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
@@ -1682,7 +1682,7 @@
|
||||
echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
|
||||
+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG"
|
||||
fi
|
||||
rm -f conftest*
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
@@ -1699,143 +1699,6 @@
|
||||
rm -f conf.gtktest
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Date created: 10 June 1997
|
||||
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
|
||||
#
|
||||
# $Id: Makefile,v 1.25 1998/08/05 09:31:12 asami Exp $
|
||||
# $Id: Makefile,v 1.26 1998/08/07 23:56:26 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= imlib-1.7
|
||||
@ -18,7 +18,7 @@ LIB_DEPENDS= png\\.2\\.:${PORTSDIR}/graphics/png \
|
||||
jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
|
||||
tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
|
||||
gif\\.3\\.:${PORTSDIR}/graphics/giflib \
|
||||
gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
|
||||
gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_X_PREFIX= yes
|
||||
|
||||
@ -1,5 +1,84 @@
|
||||
--- configure.orig Sat Jul 18 10:57:31 1998
|
||||
+++ configure Sun Jul 19 01:53:34 1998
|
||||
+++ configure Mon Aug 24 10:04:27 1998
|
||||
@@ -1482,18 +1482,18 @@
|
||||
if test x$gtk_config_exec_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
if test x$gtk_config_prefix != x ; then
|
||||
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
||||
if test x${GTK_CONFIG+set} != xset ; then
|
||||
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
||||
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
|
||||
fi
|
||||
fi
|
||||
|
||||
- # Extract the first word of "gtk-config", so it can be a program name with args.
|
||||
-set dummy gtk-config; ac_word=$2
|
||||
+ # Extract the first word of "gtk11-config", so it can be a program name with args.
|
||||
+set dummy gtk11-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1499: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
||||
@@ -1574,16 +1574,16 @@
|
||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
||||
(gtk_micro_version != $gtk_config_micro_version))
|
||||
{
|
||||
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
||||
- printf ("*** was found! If gtk-config was correct, then it is best\n");
|
||||
+ printf ("*** was found! If gtk11-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
|
||||
+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
|
||||
+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
|
||||
printf("*** before re-running configure\n");
|
||||
}
|
||||
else
|
||||
@@ -1603,10 +1603,10 @@
|
||||
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
|
||||
+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
|
||||
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
|
||||
+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
@@ -1637,10 +1637,10 @@
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
- echo "*** The gtk-config script installed by GTK could not be found"
|
||||
+ echo "*** The gtk11-config script installed by GTK could not be found"
|
||||
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
||||
- echo "*** full path to gtk-config."
|
||||
+ echo "*** full path to gtk11-config."
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
@@ -1682,7 +1682,7 @@
|
||||
echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
||||
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
||||
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
|
||||
+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG"
|
||||
fi
|
||||
rm -f conftest*
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
@@ -1699,143 +1699,6 @@
|
||||
rm -f conf.gtktest
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user