From owner-freebsd-ports Sat Jan 30 13:20:06 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA15044 for freebsd-ports-outgoing; Sat, 30 Jan 1999 13:20:06 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA14979 for ; Sat, 30 Jan 1999 13:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id NAA55448; Sat, 30 Jan 1999 13:20:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA14652 for ; Sat, 30 Jan 1999 13:16:25 -0800 (PST) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.2/8.9.2) id XAA83235; Sat, 30 Jan 1999 23:16:15 +0200 (SAT) (envelope-from reg) Message-Id: <199901302116.XAA83235@shale.csir.co.za> Date: Sat, 30 Jan 1999 23:16:15 +0200 (SAT) From: reg@shale.csir.co.za Reply-To: reg@shale.csir.co.za To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9815: Port fix: gnomecore Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9815 >Category: ports >Synopsis: Port fix: gnomecore >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 13: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: Unbreak port by adding patch-ah. Revive patch-af for 4.0-CURRENT support. Remove impilict dependenicies. Cleanup CONFIGURE_ENV. >How-To-Repeat: >Fix: diff -urN gnomecore.old/Makefile gnomecore/Makefile --- gnomecore.old/Makefile Wed Jan 27 10:31:53 1999 +++ gnomecore/Makefile Wed Jan 27 13:06:30 1999 @@ -8,19 +8,18 @@ DISTNAME= gnome-core-0.99.3.2 PKGNAME= gnomecore-0.99.3.2 -CATEGORIES= x11 +CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= gnome-core MAINTAINER= nacai@iname.com RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ - gtop.1:${PORTSDIR}/devel/libgtop \ - esd.1:${PORTSDIR}/audio/esound \ +LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ ghttp.0:${PORTSDIR}/www/libghttp -BROKEN= "can't work with gtk 1.1.13, but 0.99.4 will release soon" +# implicit dependencies +# gettext, esound, gnomelibs USE_X_PREFIX= yes USE_GMAKE= yes @@ -28,11 +27,8 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - CXXFLAGS="${CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${X11BASE}/bin/glib11d-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff -urN gnomecore.old/patches/patch-af gnomecore/patches/patch-af --- gnomecore.old/patches/patch-af Thu Jan 1 02:00:00 1970 +++ gnomecore/patches/patch-af Sat Jan 30 22:53:15 1999 @@ -0,0 +1,20 @@ +--- ltconfig.orig Sat Jan 30 22:52:39 1999 ++++ ltconfig Sat Jan 30 22:53:00 1999 +@@ -1201,7 +1201,7 @@ + ;; + + # 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*) ++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' diff -urN gnomecore.old/patches/patch-ah gnomecore/patches/patch-ah --- gnomecore.old/patches/patch-ah Thu Jan 1 02:00:00 1970 +++ gnomecore/patches/patch-ah Fri Jan 22 01:08:10 1999 @@ -0,0 +1,11 @@ +--- gmenu/gmenu.c.orig Fri Jan 22 01:06:53 1999 ++++ gmenu/gmenu.c Fri Jan 22 01:07:10 1999 +@@ -353,7 +353,7 @@ + gtk_clist_set_row_height(GTK_CLIST(menu_tree_ctree),22); + gtk_clist_set_column_width(GTK_CLIST(menu_tree_ctree),0,300); + gtk_clist_set_selection_mode(GTK_CLIST(menu_tree_ctree),GTK_SELECTION_SINGLE); +- gtk_ctree_set_reorderable(GTK_CTREE(menu_tree_ctree),TRUE); ++ gtk_clist_set_reorderable(GTK_CLIST(menu_tree_ctree),TRUE); + gtk_ctree_set_drag_compare_func(GTK_CTREE(menu_tree_ctree), tree_move_test_cb); + gtk_signal_connect_after(GTK_OBJECT(menu_tree_ctree),"button_release_event", GTK_SIGNAL_FUNC(tree_item_selected),NULL); + gtk_signal_connect(GTK_OBJECT(menu_tree_ctree),"tree_move", GTK_SIGNAL_FUNC(tree_moved),"before"); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message