diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-30 03:51:43 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-30 03:51:43 +0000 |
| commit | 3c9cd48af24a967707d9b256324d0015196ebdd0 (patch) | |
| tree | bfe497b3ed45a1e4a546366725c83d623de5ef8e /deskutils | |
| parent | Update to version 0.26. (diff) | |
Set USELIBTOOL=yes and use new gnome libs.
PR: 11844
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Notes
Notes:
svn path=/head/; revision=19114
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 17 | ||||
| -rw-r--r-- | deskutils/gnome-utils/files/patch-aa | 11 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/Makefile | 17 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/files/patch-aa | 11 |
4 files changed, 36 insertions, 20 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 4d6dd9237df1..090fd8c6012b 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,7 +3,7 @@ # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $ +# $Id: Makefile,v 1.8 1999/04/08 18:08:34 steve Exp $ # DISTNAME= gnome-utils-1.0.1 @@ -18,19 +18,18 @@ BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/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" MAN1= gtt.1 -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa index 2e73d96fd7b0..c814062cbc36 100644 --- a/deskutils/gnome-utils/files/patch-aa +++ b/deskutils/gnome-utils/files/patch-aa @@ -1,5 +1,14 @@ --- configure.orig Tue Mar 2 00:23:40 1999 -+++ configure Sat Mar 6 23:55:23 1999 ++++ configure Sat May 22 21:54:01 1999 +@@ -2387,7 +2387,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 @@ -3143,7 +3143,7 @@ echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 4d6dd9237df1..090fd8c6012b 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -3,7 +3,7 @@ # Date created: 03 July 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.7 1999/03/09 01:09:00 nectar Exp $ +# $Id: Makefile,v 1.8 1999/04/08 18:08:34 steve Exp $ # DISTNAME= gnome-utils-1.0.1 @@ -18,19 +18,18 @@ BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/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" MAN1= gtt.1 -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa index 2e73d96fd7b0..c814062cbc36 100644 --- a/deskutils/gnomeutils2/files/patch-aa +++ b/deskutils/gnomeutils2/files/patch-aa @@ -1,5 +1,14 @@ --- configure.orig Tue Mar 2 00:23:40 1999 -+++ configure Sat Mar 6 23:55:23 1999 ++++ configure Sat May 22 21:54:01 1999 +@@ -2387,7 +2387,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 @@ -3143,7 +3143,7 @@ echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 |