Date: Sun, 31 Jan 1999 00:18:40 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9817: Port upgrade: gnomeobjc Message-ID: <199901302218.AAA46963@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 9817
>Category: ports
>Synopsis: Port upgrade: gnomeobjc
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 30 14:20:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 3.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports collection
>Description:
Upgrade to gnome-objc-0.99.3. Cleanup CONFIGURE_ENV. Add impilict
depends. 4.0-CURRENT support. Lots of Makefile.in changes caused
by new automake.
Tests for -lc_r removed since the code does not use pthreads and
does not support the libc_r instead of libc model.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /usr/home/ncvs/ports/lang/gnomeobjc/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 1999/01/27 08:31:51 1.7
+++ Makefile 1999/01/27 10:59:23
@@ -1,14 +1,14 @@
# New ports collection makefile for: gnomeobjc
-# Version required: 0.99.1
+# Version required: 0.99.3
# Date created: 02 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $Id: Makefile,v 1.7 1999/01/27 08:31:51 fenner Exp $
#
-DISTNAME= gnome-objc-0.99.1
-PKGNAME= gnomeobjc-0.99.1
-CATEGORIES= lang
+DISTNAME= gnome-objc-0.99.3
+PKGNAME= gnomeobjc-0.99.3
+CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gnome-objc
@@ -16,15 +16,16 @@
LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs
+# implicit dependencies
+# gettext, gtk11-devel
+
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${X11BASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
post-install:
Index: files/md5
===================================================================
RCS file: /usr/home/ncvs/ports/lang/gnomeobjc/files/md5,v
retrieving revision 1.2
diff -u -r1.2 md5
--- md5 1999/01/05 12:55:38 1.2
+++ md5 1999/01/22 10:22:57
@@ -1 +1 @@
-MD5 (gnome-objc-0.99.1.tar.gz) = 248b305aadb54c87cb0f97c6357c2cf2
+MD5 (gnome-objc-0.99.3.tar.gz) = 9b94f2f2ed619355ed518274f28127f1
Index: patches/patch-aa
===================================================================
RCS file: /usr/home/ncvs/ports/lang/gnomeobjc/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patch-aa 1999/01/05 12:55:38 1.2
+++ patch-aa 1999/01/30 21:57:54
@@ -1,14 +1,14 @@
---- configure.orig Tue Jan 5 18:48:14 1999
-+++ configure Tue Jan 5 18:49:13 1999
-@@ -1584,13 +1584,13 @@
+--- configure.orig Mon Jan 18 21:43:17 1999
++++ configure Sat Jan 30 23:57:45 1999
+@@ -2110,13 +2110,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:1589: checking for gnomeConf.sh file in $gnome_prefix" >&5
+-echo "configure:2115: 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:1589: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
++echo "configure:2115: 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" \
@@ -19,3 +19,129 @@
else
echo "$ac_t""not found" 1>&6
+@@ -4348,46 +4348,6 @@
+ PTHREAD_LIB="-lpthread"
+ else
+ echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:4353: checking for pthread_create in -lc_r" >&5
+-ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lc_r $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4361 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char pthread_create();
+-
+-int main() {
+-pthread_create()
+-; return 0; }
+-EOF
+-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- PTHREAD_LIB="-lc_r"
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+ fi
+
+
+@@ -5661,10 +5621,6 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
+--- obgtk/configure.orig Mon Jan 18 20:50:17 1999
++++ obgtk/configure Sat Jan 30 23:57:46 1999
+@@ -1094,13 +1094,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:1099: 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:1099: 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
+@@ -2683,46 +2683,6 @@
+ PTHREAD_LIB="-lpthread"
+ else
+ echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:2688: checking for pthread_create in -lc_r" >&5
+-ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lc_r $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2696 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char pthread_create();
+-
+-int main() {
+-pthread_create()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- PTHREAD_LIB="-lc_r"
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+ fi
+
+
Index: patches/patch-ab
===================================================================
RCS file: /usr/home/ncvs/ports/lang/gnomeobjc/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patch-ab 1999/01/05 12:55:38 1.2
+++ patch-ab 1999/01/22 10:32:38
@@ -1,56 +1,56 @@
---- Makefile.in.orig Tue Jan 5 18:41:09 1999
-+++ Makefile.in Tue Jan 5 18:41:38 1999
+--- Makefile.in.orig Mon Jan 18 21:51:27 1999
++++ Makefile.in Fri Jan 22 12:26:19 1999
@@ -127,7 +127,7 @@
- gnome-objc.spec \
- obgnome-config.in
+ EXTRA_DIST = obGnomeConf.sh.in gnome-objc.spec obgnome-config.in
--confexecdir=$(libdir)
-+confexecdir=$(datadir)
- confexec_DATA=obGnomeConf.sh
+
+-confexecdir = $(libdir)
++confexecdir = $(datadir)
+ confexec_DATA = obGnomeConf.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- obgnome/Makefile.in.orig Tue Jan 5 18:41:59 1999
-+++ obgnome/Makefile.in Tue Jan 5 18:42:30 1999
-@@ -137,7 +137,7 @@
- INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
- -DGNOMELIBDIR=\""$(libdir)"\" \
- -DGNOMEDATADIR=\""$(datadir)"\" \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale\"" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
- $(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/intl
-
-@@ -188,7 +188,7 @@
- obgnomeStock.h \
- obgnomeStockButton.h
+--- obgnome/Makefile.in.orig Mon Jan 18 21:51:36 1999
++++ obgnome/Makefile.in Fri Jan 22 12:28:35 1999
+@@ -136,7 +136,7 @@
+
+ lib_LTLIBRARIES = libobgnome.la
+
+-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) -DGNOMELIBDIR=\""$(libdir)"\" -DGNOMEDATADIR=\""$(datadir)"\" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl
++INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) -DGNOMELIBDIR=\""$(libdir)"\" -DGNOMEDATADIR=\""$(datadir)"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl
+
+
+ libobgnome_la_SOURCES = obgnomeAnimator.m obgnomeApp.m obgnomeAppWin.m obgnomeAbout.m obgnomeCalculator.m obgnomeCanvas.m obgnomeCanvasLine.m obgnomeCanvasRectEllipse.m obgnomeCanvasText.m obgnomeCanvasWidget.m obgnomeDateEdit.m obgnomeDialog.m obgnomeEntry.m obgnomeFileEntry.m obgnomeFontSelector.m obgnomeLess.m obgnomeMessageBox.m obgnomePixmap.m obgnomePropertyBox.m obgnomeStock.m obgnomeStockButton.m
+@@ -145,7 +145,7 @@
+ libobgnomeinclude_HEADERS = obgnome.h obgnomeAnimator.h obgnomeApp.h obgnomeAppWin.h obgnomeAbout.h obgnomeCalculator.h obgnomeCanvas.h obgnomeCanvasLine.h obgnomeCanvasRectEllipse.h obgnomeCanvasText.h obgnomeCanvasWidget.h obgnomeDateEdit.h obgnomeDialog.h obgnomeEntry.h obgnomeFileEntry.h obgnomeFontSelector.h obgnomeLess.h obgnomeMessageBox.h obgnomePixmap.h obgnomePropertyBox.h obgnomeStock.h obgnomeStockButton.h
+
-libobgnome_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libobgnome_la_LDFLAGS = -version-info 0:99:0 -rpath $(libdir)
- libobgnome_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_LIBS) \
- $(GTK_LIBS)
+ libobgnome_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_LIBS) $(GTK_LIBS)
---- obgtk/Makefile.in.orig Tue Jan 5 18:42:39 1999
-+++ obgtk/Makefile.in Tue Jan 5 18:43:05 1999
-@@ -119,7 +119,7 @@
- INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
- -DGNOMELIBDIR=\""$(libdir)"\" \
- -DGNOMEDATADIR=\""$(datadir)"\" \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale\"" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \
- -I$(top_srcdir)/intl
+--- obgtk/Makefile.in.orig Mon Jan 18 21:51:32 1999
++++ obgtk/Makefile.in Fri Jan 22 12:31:10 1999
+@@ -118,7 +118,7 @@
+
+ lib_LTLIBRARIES = libobgtk.la
+
+-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) -DGNOMELIBDIR=\""$(libdir)"\" -DGNOMEDATADIR=\""$(datadir)"\" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -I$(top_srcdir)/intl
++INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) -DGNOMELIBDIR=\""$(libdir)"\" -DGNOMEDATADIR=\""$(datadir)"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -I$(top_srcdir)/intl
+
+
#libobgtk_la_DEPENDENCIES = @OBGTK_ACCEL_OBJS@
-@@ -308,7 +308,7 @@
- obgtkWidget.h \
- obgtkWindow.h
+@@ -129,7 +129,7 @@
+ libobgtkinclude_HEADERS = obgtk.h obgtkAccelGroup.h obgtkAccelLabel.h obgtkAdjustment.h obgtkAlignment.h obgtkApp.h obgtkArrow.h obgtkAspectFrame.h obgtkBin.h obgtkBox.h obgtkButton.h obgtkButtonBox.h obgtkCalendar.h obgtkCheckButton.h obgtkCheckMenuItem.h obgtkCList.h obgtkCTree.h obgtkColorSelection.h obgtkColorSelectionDialog.h obgtkCombo.h obgtkContainer.h obgtkCurve.h obgtkData.h obgtkDialog.h obgtkDrawingArea.h obgtkEditable.h obgtkEntry.h obgtkEventBox.h obgtkFileSelection.h obgtkFixed.h obgtkFontSelection.h obgtkFrame.h obgtkGammaCurve.h obgtkHandleBox.h obgtkHBox.h obgtkHButtonBox.h obgtkHPaned.h obgtkHRuler.h obgtkHScale.h obgtkHScrollbar.h obgtkHSeparator.h obgtkImage.h obgtkInputDialog.h obgtkItem.h obgtkLabel.h obgtkLayout.h obgtkList.h obgtkListItem.h obgtkMenu.h obgtkMenuBar.h obgtkMenuItem.h obgtkMenuShell.h obgtkMisc.h obgtkNotebook.h obgtkObject.h obgtkOptionMenu.h obgtkPacker.h obgtkPaned.h obgtkPix!
map.h obgtkPreview.h obgtkProgress.h obgtkProgressBar.h obgtkRadioButton.h obgtkRadioMenuItem.h obgtkRange.h obgtkRuler.h obgtkScale.h obgtkScrollbar.h obgtkScrolledWindow.h obgtkSeparator.h obgtkSpinButton.h obgtkStatusbar.h obgtkTable.h obgtkTearoffMenuItem.h obgtkText.h obgtkTipsQuery.h obgtkToggleButton.h obgtkToolbar.h obgtkTooltips.h obgtkTree.h obgtkTreeItem.h obgtkVBox.h obgtkVButtonBox.h obgtkVPaned.h obgtkVRuler.h obgtkVScale.h obgtkVScrollbar.h obgtkVSeparator.h obgtkViewport.h obgtkWidget.h obgtkWindow.h
+
-libobgtk_la_LDFLAGS = -version-info 2:3:1 -rpath $(libdir)
+libobgtk_la_LDFLAGS = -version-info 0:99:0 -rpath $(libdir)
libobgtk_la_LIBADD = $(GTK_LIBS)
- noinst_PROGRAMS=obgtk-test
---- po/Makefile.in.in.orig Tue Jan 5 18:58:00 1999
-+++ po/Makefile.in.in Tue Jan 5 18:58:09 1999
+ noinst_PROGRAMS = obgtk-test
+--- po/Makefile.in.in.orig Mon Jan 18 20:50:18 1999
++++ po/Makefile.in.in Fri Jan 22 12:25:31 1999
@@ -18,7 +18,7 @@
prefix = @prefix@
Index: patches/patch-ac
===================================================================
RCS file: /usr/home/ncvs/ports/lang/gnomeobjc/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- patch-ac 1999/01/28 21:31:41 1.3
+++ patch-ac 1999/01/30 21:19:56
@@ -1,44 +1,20 @@
---- ltmain.sh.orig Tue Jan 5 18:43:41 1999
-+++ ltmain.sh Tue Jan 5 18:44:52 1999
-@@ -1030,6 +1030,16 @@
- versuffix=".$current.$revision"
- ;;
+--- ltconfig.orig Sat Jan 30 23:19:32 1999
++++ ltconfig Sat Jan 30 23:19:46 1999
+@@ -1201,7 +1201,7 @@
+ ;;
-+ freebsd)
-+ version_vars="$version_vars major versuffix"
-+ major=".$current"
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ versuffix=".$current"
-+ else
-+ versuffix=".$current.$revision"
-+ fi
-+ ;;
-+
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig Tue Jan 5 18:43:44 1999
-+++ ltconfig Tue Jan 5 18:45:47 1999
-@@ -1160,10 +1160,21 @@
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+- freebsd3*)
++ freebsd3* | freebsd4*)
+ archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -1606,7 +1606,7 @@
+ shlibpath_var=PATH
;;
-freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
++freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
library_names_spec='${libname}${release}.so$versuffix $libname.so'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd3* | freebsd4*)
-+ version_type=freebsd
-+ library_names_spec='${libname}${release}.so$versuffix $libname.so'
-+ if [ $PORTOBJFORMAT = elf ]; then
-+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+ else
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ fi
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
>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?199901302218.AAA46963>