From a9e43cb60f09d4a7c2096d13ee57a5482fea887d Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Wed, 30 Sep 1998 13:44:30 +0000 Subject: Upgrade to 0.3. --- graphics/electriceyes/Makefile | 16 +++--- graphics/electriceyes/distinfo | 2 +- graphics/electriceyes/files/patch-aa | 101 ++++------------------------------- graphics/electriceyes/pkg-plist | 7 --- 4 files changed, 21 insertions(+), 105 deletions(-) (limited to 'graphics') diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index e98ce9f1f9c3..0fa42e7e7ad5 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -1,28 +1,30 @@ # New ports collection makefile for: electriceyes -# Version required: 0.2 +# Version required: 0.3 # Date created: 21 August 1998 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.1.1.1 1998/09/06 06:45:28 vanilla Exp $ +# $Id: Makefile,v 1.2 1998/09/15 10:50:56 asami Exp $ # -DISTNAME= ee-0.2 -PKGNAME= electriceyes-0.2 +DISTNAME= ee-0.3 +PKGNAME= electriceyes-0.3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \ ftp://ftp.gnome.org/pub/GNOME/sources/ MAINTAINER= Nakai@technologist.com -LIB_DEPENDS= panel_applet\\.0:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnome.0:${PORTSDIR}/x11/gnomelibs USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I./intl" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" +CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ + -I${LOCALBASE}/include" \ + GTK_CONFIG="${X11BASE}/bin/gtk11-config" \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: ${MV} ${PREFIX}/bin/ee ${PREFIX}/bin/ElectricEyes diff --git a/graphics/electriceyes/distinfo b/graphics/electriceyes/distinfo index 5bddf275f59c..abd573fc327e 100644 --- a/graphics/electriceyes/distinfo +++ b/graphics/electriceyes/distinfo @@ -1 +1 @@ -MD5 (ee-0.2.tar.gz) = e97b7b251f1e22bff1daa113f1f79b06 +MD5 (ee-0.3.tar.gz) = 94b3cfc04813a86aacf3d262c93569fe diff --git a/graphics/electriceyes/files/patch-aa b/graphics/electriceyes/files/patch-aa index a2006d65cf31..505bcfc837a0 100644 --- a/graphics/electriceyes/files/patch-aa +++ b/graphics/electriceyes/files/patch-aa @@ -1,99 +1,20 @@ ---- configure.orig Tue Sep 1 12:01:14 1998 -+++ configure Tue Sep 1 12:05:40 1998 -@@ -929,12 +929,12 @@ +--- configure.orig Sun Sep 27 02:07:45 1998 ++++ configure Sun Sep 27 02:08:39 1998 +@@ -873,12 +873,12 @@ + fi - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:934: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:934: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then +- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 +-echo "configure:878: checking for gnomeConf.sh file in $gnome_prefix" >&5 +- if test -f $gnome_prefix/gnomeConf.sh; then ++ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 ++echo "configure:878: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 ++ if test -f $prefix/share/gnome/gnomeConf.sh; then echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh + echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh" + . $prefix/share/gnome/gnomeConf.sh - else + else echo "$ac_t""not found" 1>&6 -@@ -1897,18 +1897,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:1914: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then -@@ -1990,16 +1990,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 if ((gtk_major_version != GTK_MAJOR_VERSION) || -@@ -2028,10 +2028,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"); - } -@@ -2062,10 +2062,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 - : -@@ -2107,7 +2107,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" diff --git a/graphics/electriceyes/pkg-plist b/graphics/electriceyes/pkg-plist index 78e316ae7635..9c285a28e0ca 100644 --- a/graphics/electriceyes/pkg-plist +++ b/graphics/electriceyes/pkg-plist @@ -1,14 +1,7 @@ bin/ElectricEyes share/gnome/apps/Graphics/ee.desktop -share/gnome/help/ee/C/colors.png -share/gnome/help/ee/C/editwin.png share/gnome/help/ee/C/ee.png -share/gnome/help/ee/C/geom.png share/gnome/help/ee/C/index.html -share/gnome/help/ee/C/list.png -share/gnome/help/ee/C/thumbs.png -share/gnome/help/ee/C/topic.dat -share/gnome/help/ee/C/view.png share/locale/de/LC_MESSAGES/ee.mo share/locale/es/LC_MESSAGES/ee.mo share/locale/fi/LC_MESSAGES/ee.mo -- cgit v1.2.3