Date: Sat, 6 Mar 1999 15:41:38 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10427: Port update: x11-toolkits/gtk-engines Message-ID: <199903061341.PAA51330@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10427
>Category: ports
>Synopsis: Port update: x11-toolkits/gtk-engines
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 05:50:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Update to gtk-engines-0.5.
>How-To-Repeat:
Requires updated bsd.port.mk and gettext (ports/10293). Adds
patch-ad.
>Fix:
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/Makefile /usr/ports/x11-toolkits/gtk-engines/Makefile
--- /usr/ports.ref/x11-toolkits/gtk-engines/Makefile Wed Feb 3 02:01:32 1999
+++ /usr/ports/x11-toolkits/gtk-engines/Makefile Sat Mar 6 15:28:07 1999
@@ -1,15 +1,15 @@
# New ports collection makefile for: gtk-engines
-# Version required: 0.1
+# Version required: 0.5
# Date Created: 23 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $
#
-DISTNAME= gtk-engines-0.1
+DISTNAME= gtk-engines-0.5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= gtk-engines
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= vanilla@FreeBSD.ORG
@@ -17,7 +17,7 @@
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config"
+CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config"
THEMES= metal notif pixmap redmond95
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/files/md5 /usr/ports/x11-toolkits/gtk-engines/files/md5
--- /usr/ports.ref/x11-toolkits/gtk-engines/files/md5 Mon Dec 28 17:54:53 1998
+++ /usr/ports/x11-toolkits/gtk-engines/files/md5 Tue Mar 2 19:04:45 1999
@@ -1 +1 @@
-MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306
+MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-aa /usr/ports/x11-toolkits/gtk-engines/patches/patch-aa
--- /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-aa Wed Feb 3 02:01:33 1999
+++ /usr/ports/x11-toolkits/gtk-engines/patches/patch-aa Wed Feb 17 01:50:24 1999
@@ -1,53 +1,11 @@
---- ltmain.sh.orig Thu Dec 17 01:05:24 1998
-+++ ltmain.sh Tue Feb 2 20:32:19 1999
-@@ -1030,6 +1030,16 @@
- versuffix=".$current.$revision"
- ;;
-
-+ 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 Thu Dec 17 01:05:21 1998
-+++ ltconfig Tue Feb 2 20:32:51 1999
-@@ -827,7 +827,7 @@
- ;;
-
- # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-- freebsd3*)
-+ freebsd*)
- 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'
- ;;
-
--freebsd2* | freebsd3*)
-+freebsd2*)
- version_type=sunos
- library_names_spec='${libname}${release}.so$versuffix $libname.so'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd*)
-+ 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
+--- ltconfig.orig Wed Feb 17 01:49:26 1999
++++ ltconfig Wed Feb 17 01:49:58 1999
+@@ -1683,7 +1683,7 @@
+ deplibs_check_method=unknown
+ ;;
+ esac
+- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++ library_names_spec='${libname}.so$versuffix $libname.so'
+ finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- ;;
-
+ need_version=yes
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ab /usr/ports/x11-toolkits/gtk-engines/patches/patch-ab
--- /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ab Mon Dec 28 17:54:54 1998
+++ /usr/ports/x11-toolkits/gtk-engines/patches/patch-ab Wed Feb 17 01:27:20 1999
@@ -1,42 +1,42 @@
---- metal/Makefile.in.orig Wed Dec 23 19:01:32 1998
-+++ metal/Makefile.in Wed Dec 23 19:03:31 1998
-@@ -81,7 +81,7 @@
+--- metal/Makefile.in.orig Fri Feb 12 06:33:06 1999
++++ metal/Makefile.in Wed Feb 17 01:24:53 1999
+@@ -84,7 +84,7 @@
SUBDIRS = Theme
- INCLUDES = $(GTK_CFLAGS) $(GDK_IMLIB_CFLAGS)
- LIBS = $(GTK_LIBS) $(GDK_IMLIB_LIBS)
+ INCLUDES = $(GTK_CFLAGS)
+
-enginedir = $(libdir)/gtk/themes/engines
+enginedir = $(datadir)/themes/engines
# replace the "metal" prefix with whatever you're using
engine_LTLIBRARIES = libmetal.la
---- notif/Makefile.in.orig Wed Dec 23 19:03:41 1998
-+++ notif/Makefile.in Wed Dec 23 19:03:52 1998
-@@ -81,7 +81,7 @@
+--- notif/Makefile.in.orig Fri Feb 12 06:33:03 1999
++++ notif/Makefile.in Wed Feb 17 01:25:45 1999
+@@ -84,7 +84,7 @@
SUBDIRS = Theme
- INCLUDES = $(GTK_CFLAGS) $(GDK_IMLIB_CFLAGS)
- LIBS = $(GTK_LIBS) $(GDK_IMLIB_LIBS)
+ INCLUDES = $(GTK_CFLAGS)
+
-enginedir = $(libdir)/gtk/themes/engines
+enginedir = $(datadir)/themes/engines
# replace the "notif" prefix with whatever you're using
engine_LTLIBRARIES = libnotif.la
---- pixmap/Makefile.in.orig Wed Dec 23 19:04:01 1998
-+++ pixmap/Makefile.in Wed Dec 23 19:04:13 1998
-@@ -81,7 +81,7 @@
+--- pixmap/Makefile.in.orig Fri Feb 12 06:32:57 1999
++++ pixmap/Makefile.in Wed Feb 17 01:26:15 1999
+@@ -84,7 +84,7 @@
SUBDIRS = Theme
- INCLUDES = $(GTK_CFLAGS) $(GDK_IMLIB_CFLAGS)
- LIBS = $(GTK_LIBS) $(GDK_IMLIB_LIBS)
+ INCLUDES = $(GDK_IMLIB_CFLAGS)
+
-enginedir = $(libdir)/gtk/themes/engines
+enginedir = $(datadir)/themes/engines
# replace the "pixmap" prefix with whatever you're using
engine_LTLIBRARIES = libpixmap.la
---- redmond95/Makefile.in.orig Wed Dec 23 19:04:17 1998
-+++ redmond95/Makefile.in Wed Dec 23 19:04:28 1998
-@@ -81,7 +81,7 @@
+--- redmond95/Makefile.in.orig Fri Feb 12 06:33:00 1999
++++ redmond95/Makefile.in Wed Feb 17 01:26:50 1999
+@@ -84,7 +84,7 @@
SUBDIRS = Theme
- INCLUDES = $(GTK_CFLAGS) $(GDK_IMLIB_CFLAGS)
- LIBS = $(GTK_LIBS) $(GDK_IMLIB_LIBS)
+ INCLUDES = $(GTK_CFLAGS)
+
-enginedir = $(libdir)/gtk/themes/engines
+enginedir = $(datadir)/themes/engines
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ac /usr/ports/x11-toolkits/gtk-engines/patches/patch-ac
--- /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ac Sat Jan 30 21:42:47 1999
+++ /usr/ports/x11-toolkits/gtk-engines/patches/patch-ac Wed Feb 17 01:24:09 1999
@@ -1,17 +1,13 @@
---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999
-+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999
-@@ -13,9 +13,9 @@
- # testgtkrc2 sets all the buttons in the main window to blue by default
- #include "testgtkrc2"
-
--#module_path ".:/home/raster/themes"
+--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999
++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999
+@@ -1,3 +1,7 @@
+#module_path "%%PREFIX%%/share/themes"
-
--pixmap_path "."
++
+pixmap_path "%%PREFIX%%/share/themes/Metal/gtk"
-
++
style "default"
{
+ font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1"
--- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999
+++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999
@@ -13,9 +13,9 @@
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ad /usr/ports/x11-toolkits/gtk-engines/patches/patch-ad
--- /usr/ports.ref/x11-toolkits/gtk-engines/patches/patch-ad Thu Jan 1 02:00:00 1970
+++ /usr/ports/x11-toolkits/gtk-engines/patches/patch-ad Sat Feb 27 23:21:22 1999
@@ -0,0 +1,11 @@
+--- configure.orig Wed Feb 17 14:03:55 1999
++++ configure Wed Feb 17 14:04:44 1999
+@@ -2455,7 +2455,7 @@
+
+ # We don't want to put GTK+ back into the shlibdeps, because that
+ # could cause the _wrong_ version of GTK+ to be pulled in.
+-GDK_IMLIB_LIBS=`echo $GDK_IMLIB_LIBS | sed -e 's/-lgdk / /' -e 's/-lgtk//' -e 's/-lglib//'`
++GDK_IMLIB_LIBS=`echo $GDK_IMLIB_LIBS | sed -e 's/-lgdk12//' -e 's/-lgtk12//' -e 's/-lglib12//'`
+
+ # Checks for header files.
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
diff -urN -x CVS /usr/ports.ref/x11-toolkits/gtk-engines/pkg/PLIST /usr/ports/x11-toolkits/gtk-engines/pkg/PLIST
--- /usr/ports.ref/x11-toolkits/gtk-engines/pkg/PLIST Wed Feb 3 02:01:33 1999
+++ /usr/ports/x11-toolkits/gtk-engines/pkg/PLIST Wed Feb 17 18:17:00 1999
@@ -79,19 +79,15 @@
share/themes/Redmond95/ICON.png
share/themes/Redmond95/README.html
share/themes/Redmond95/gtk/gtkrc
-share/themes/engines/libmetal.a
share/themes/engines/libmetal.la
share/themes/engines/libmetal.so
share/themes/engines/libmetal.so.0
-share/themes/engines/libnotif.a
share/themes/engines/libnotif.la
share/themes/engines/libnotif.so
share/themes/engines/libnotif.so.0
-share/themes/engines/libpixmap.a
share/themes/engines/libpixmap.la
share/themes/engines/libpixmap.so
share/themes/engines/libpixmap.so.0
-share/themes/engines/libredmond95.a
share/themes/engines/libredmond95.la
share/themes/engines/libredmond95.so
share/themes/engines/libredmond95.so.0
>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?199903061341.PAA51330>