From owner-freebsd-ports Sat Jan 30 11:00:06 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA25253 for freebsd-ports-outgoing; Sat, 30 Jan 1999 11:00: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 LAA25191 for ; Sat, 30 Jan 1999 11:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id LAA48614; Sat, 30 Jan 1999 11:00:01 -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 KAA24843 for ; Sat, 30 Jan 1999 10:56:49 -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 UAA77213; Sat, 30 Jan 1999 20:56:42 +0200 (SAT) (envelope-from reg) Message-Id: <199901301856.UAA77213@shale.csir.co.za> Date: Sat, 30 Jan 1999 20:56:42 +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/9805: Port fix: gtk-engines Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9805 >Category: ports >Synopsis: Port fix: gtk-engines >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 11:00: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: Remove .tw mirror site (use MASTER_SITE_GNOME). Honour $PREFIX in patch-ac. Fix support for 4.0-CURRENT. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/x11-toolkits/gtk-engines/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 1999/01/27 08:31:54 1.4 +++ Makefile 1999/01/30 18:48:49 @@ -8,8 +8,7 @@ DISTNAME= gtk-engines-0.1 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://freebsd.csie.nctu.edu.tw/Upload/ \ - ${MASTER_SITE_GNOME} +MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= gtk-engines MAINTAINER= vanilla@FreeBSD.ORG @@ -21,6 +20,11 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" + +post-patch: + @(cd ${WRKSRC}/pixmap/Theme/gtk; \ + ${MV} gtkrc gtkrc.tmp; \ + ${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc ) post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib Index: patches/patch-aa =================================================================== RCS file: /usr/home/ncvs/ports/x11-toolkits/gtk-engines/patches/patch-aa,v retrieving revision 1.3 diff -u -r1.3 patch-aa --- patch-aa 1999/01/28 21:31:44 1.3 +++ patch-aa 1999/01/30 18:47:07 @@ -17,8 +17,17 @@ *) $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 Fri Jan 1 03:26:24 1999 -+++ ltconfig Fri Jan 1 03:28:21 1999 +--- ltconfig.orig Wed Dec 16 19:05:21 1998 ++++ ltconfig Sat Jan 30 20:46:18 1999 +@@ -827,7 +827,7 @@ + ;; + + # FreeBSD 3, at last, uses gcc -shared to do shared libraries. +- freebsd3*) ++ freebsd3* | freebsd4*) + archive_cmds='$CC -shared -o $lib$libobjs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes @@ -1164,10 +1164,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' ;; @@ -31,7 +40,7 @@ + shlibpath_var=LD_LIBRARY_PATH + ;; + -+freebsd[34]*) ++freebsd3* | freebsd4*) + version_type=freebsd + library_names_spec='${libname}${release}.so$versuffix $libname.so' + if [ $PORTOBJFORMAT = elf ]; then Index: patches/patch-ac =================================================================== RCS file: /usr/home/ncvs/ports/x11-toolkits/gtk-engines/patches/patch-ac,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ac --- patch-ac 1998/12/28 15:54:54 1.1.1.1 +++ patch-ac 1999/01/30 18:50:07 @@ -1,11 +1,11 @@ ---- pixmap/Theme/gtk/gtkrc.orig Thu Dec 24 00:56:36 1998 -+++ pixmap/Theme/gtk/gtkrc Thu Dec 24 00:57:01 1998 -@@ -12,7 +12,7 @@ - - # testgtkrc2 sets all the buttons in the main window to blue by default +--- pixmap/Theme/gtk/gtkrc.orig Wed Dec 16 19:05:37 1998 ++++ pixmap/Theme/gtk/gtkrc Thu Jan 21 23:14:54 1999 +@@ -14,6 +14,8 @@ #include "testgtkrc2" -- -+pixmap_path "/usr/X11R6/share/themes/Pixmap/gtk" + #module_path ".:/home/raster/themes" ++ ++pixmap_path "%%PREFIX%%/share/themes/Pixmap/gtk" style "eventbox" { + bg_pixmap[NORMAL] = "" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message