Date: Sat, 6 Mar 1999 22:40:12 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10437: Port fix: graphics/electriceyes Message-ID: <199903062040.WAA43493@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10437
>Category: ports
>Synopsis: Port fix: graphics/electriceyes
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 12:50:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Fix port for distfile move, and some gettext related fixes.
>How-To-Repeat:
Requires updated bsd.port.mk.
>Fix:
diff -urN -x CVS /usr/ports.ref/graphics/electriceyes/Makefile ./Makefile
--- /usr/ports.ref/graphics/electriceyes/Makefile Thu Feb 25 15:20:54 1999
+++ ./Makefile Sat Mar 6 22:16:38 1999
@@ -10,7 +10,7 @@
PKGNAME= electriceyes-0.3.8
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= ee
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= nacai@iname.com
@@ -23,7 +23,7 @@
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+ GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
post-install:
diff -urN -x CVS /usr/ports.ref/graphics/electriceyes/patches/patch-aa ./patches/patch-aa
--- /usr/ports.ref/graphics/electriceyes/patches/patch-aa Thu Feb 25 15:20:54 1999
+++ ./patches/patch-aa Sat Mar 6 22:35:12 1999
@@ -1,24 +1,5 @@
---- configure.orig Wed Feb 24 05:54:38 1999
-+++ configure Wed Feb 24 05:55:40 1999
-@@ -1113,13 +1113,13 @@
- 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:1118: 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:1118: 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
-+ "$prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
+--- configure.orig Fri Feb 12 23:04:17 1999
++++ configure Sat Mar 6 22:27:13 1999
@@ -4378,7 +4378,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
@@ -28,12 +9,25 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -4640,7 +4640,7 @@
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.cat
- INSTOBJEXT=.cat
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
- INTLLIBS=$INTLDEPS
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -4766,15 +4766,15 @@
+ fi
+
+
+- USE_INCLUDED_LIBINTL=yes
++# USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+- INTLDEPS='$(top_builddir)/intl/libintl.a'
+- INTLLIBS=$INTLDEPS
+- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+- nls_cv_header_intl=intl/libintl.h
+- nls_cv_header_libgt=intl/libgettext.h
++# INTLDEPS='$(top_builddir)/intl/libintl.a'
++# INTLLIBS=$INTLDEPS
++# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++# nls_cv_header_intl=intl/libintl.h
++# nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ if test "$XGETTEXT" != ":"; then
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903062040.WAA43493>