summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-05-30 03:39:20 +0000
committerSteve Price <steve@FreeBSD.org>1999-05-30 03:39:20 +0000
commit1f69d25ae1c06cb985ff00467d8e36ae4de208d3 (patch)
tree2afda026458af8238ff4e87dec6aac3d2b28980f
parentUse new gnomelibs port and set USE_LIBTOOL=yes (diff)
Minor tweaks to work with new gtk port.
PR: 11844 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Notes
Notes: svn path=/head/; revision=19102
-rw-r--r--graphics/electriceyes/Makefile12
-rw-r--r--graphics/electriceyes/files/patch-aa19
2 files changed, 20 insertions, 11 deletions
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 250c8f22a3f6..e95158605642 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 August 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.12 1999/03/09 01:08:57 nectar Exp $
+# $Id: Makefile,v 1.13 1999/04/08 18:08:33 steve Exp $
#
DISTNAME= ee-0.3.8
@@ -17,14 +17,16 @@ MAINTAINER= nacai@iname.com
BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
+GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
- --with-gnome=${X11BASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+ --with-gnome=${PREFIX}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ GTK_CONFIG="${GTK_CONFIG}" \
+ LIBS="-L${LOCALBASE}/lib"
post-install:
${MV} ${PREFIX}/bin/ee ${PREFIX}/bin/ElectricEyes
diff --git a/graphics/electriceyes/files/patch-aa b/graphics/electriceyes/files/patch-aa
index 8cec444ff988..ce2fd023ebf2 100644
--- a/graphics/electriceyes/files/patch-aa
+++ b/graphics/electriceyes/files/patch-aa
@@ -1,5 +1,14 @@
--- configure.orig Fri Feb 12 23:04:17 1999
-+++ configure Sat Mar 6 22:27:13 1999
++++ configure Sat May 22 21:45:25 1999
+@@ -2658,7 +2658,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- PTHREAD_LIB="-lc_r"
++ PTHREAD_LIB=""
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -4378,7 +4378,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
@@ -19,13 +28,11 @@
INSTOBJEXT=.mo
DATADIRNAME=share
- INTLDEPS='$(top_builddir)/intl/libintl.a'
-- INTLLIBS=$INTLDEPS
-- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++ INTLDEPS='-lintl'
+ 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