Date: Fri, 19 Oct 2001 10:25:34 -0700 (PDT) From: Nuzrin Yaapar <p9711422@mmu.edu.my> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/31378: Port upgrade : gdkxft 1.1 -> gdkxft 1.2 Message-ID: <200110191725.f9JHPYt29357@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 31378 >Category: ports >Synopsis: Port upgrade : gdkxft 1.1 -> gdkxft 1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 19 10:30:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Nuzrin Yaapar >Release: 4.4-STABLE >Organization: Multimedia University >Environment: [nuzrin@nuzrin ~]> uname -a FreeBSD nuzrin.cyber.mmu.edu.my 4.4-STABLE FreeBSD 4.4-STABLE #0: Tue Oct 16 08:34:26 MYT 2001 root@nuzrin.cyber.mmu.edu.my:/usr/src/sys/compile/NUZRIN-ATHLON i386 >Description: * upgrade gdkxft 1.1 to gdkxft 1.2 >How-To-Repeat: None >Fix: [nuzrin@nuzrin /usr/ports/x11]> diff -ruN gdkxft gdkxft-new diff -ruN gdkxft/Makefile gdkxft-new/Makefile --- gdkxft/Makefile Wed Sep 5 16:22:11 2001 +++ gdkxft-new/Makefile Sat Oct 20 01:18:43 2001 @@ -6,7 +6,7 @@ # PORTNAME= gdkxft -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= x11 MASTER_SITES= http://philrsss.anu.edu.au/~josh/gdkxft/ @@ -29,7 +29,12 @@ post-install: @${MKDIR} ${DOCSDIR} @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - @/usr/bin/printf "\nRefer to ${DOCSDIR}/README for details on how to enable gdkxft.\n\n" > \ + @/usr/bin/printf "\nRefer to ${DOCSDIR}/README for details on how to enable gdkxft.\n\n \ + You will need to add environment variable LD_PRELOAD=/usr/X11R6/lib/libgdkxft.so.\n \ + Depending on your X11 configuration, you may need to add the line \n \ + export LD_PRELOAD=/usr/X11R6/lib/libgdkxft.so \n \ + in either ~/.xinitrc or /etc/X11/xinit/xinitrc or /usr/X11R6/bin/startx \n \ + at the near top of the file before the window manager start.\n\n" > \ ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff -ruN gdkxft/distinfo gdkxft-new/distinfo --- gdkxft/distinfo Wed Sep 5 16:22:11 2001 +++ gdkxft-new/distinfo Fri Oct 19 23:01:09 2001 @@ -1 +1 @@ -MD5 (gdkxft-1.1.tar.gz) = df59414611e76d0c6d9de3ab4dd57044 +MD5 (gdkxft-1.2.tar.gz) = 2da7e55012250ab0b5fa79fac1e602e7 diff -ruN gdkxft/files/patch-configure gdkxft-new/files/patch-configure --- gdkxft/files/patch-configure Tue Sep 4 00:54:28 2001 +++ gdkxft-new/files/patch-configure Fri Oct 19 23:59:13 2001 @@ -1,12 +1,9 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-configure,v 1.1 2001/09/03 16:54:28 sobomax Exp $ - ---- configure.orig Sat Sep 1 23:42:19 2001 -+++ configure Mon Sep 3 18:08:35 2001 -@@ -1744,9 +1744,9 @@ +--- configure.orig Fri Oct 19 23:02:56 2001 ++++ configure Fri Oct 19 23:06:07 2001 +@@ -2152,9 +2152,9 @@ echo $ac_n "checking for libgdk.la""... $ac_c" 1>&6 - echo "configure:1747: checking for libgdk.la" >&5 + echo "configure:2155: checking for libgdk.la" >&5 -GTK_PREFIX=`gtk-config --prefix` +GTK_PREFIX=`$GTK_CONFIG --prefix` GDK_LIB_PREFIX=$GTK_PREFIX/lib @@ -15,10 +12,10 @@ if test -r $GDK_LA then echo "$ac_t""$GDK_LA" 1>&6 else echo "$ac_t""not found" 1>&6 ; { echo "configure: error: libgdk.la is missing" 1>&2; exit 1; } -@@ -1754,7 +1754,7 @@ +@@ -2162,7 +2162,7 @@ echo $ac_n "checking for dlopenable libgdk.so""... $ac_c" 1>&6 - echo "configure:1757: checking for dlopenable libgdk.so" >&5 + echo "configure:2165: checking for dlopenable libgdk.so" >&5 -GDK_DLOPEN_NAME=`sed -n -e "s/^dlname='\\([^']*\\)'$/\\1/p" $GDK_LA` +GDK_DLOPEN_NAME="libgdk12.so" if test x$GDK_DLOPEN_NAME = x diff -ruN gdkxft/files/patch-src::Makefile.in gdkxft-new/files/patch-src::Makefile.in --- gdkxft/files/patch-src::Makefile.in Tue Sep 4 00:54:28 2001 +++ gdkxft-new/files/patch-src::Makefile.in Sat Oct 20 00:08:00 2001 @@ -1,18 +1,18 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-src::Makefile.in,v 1.1 2001/09/03 16:54:28 sobomax Exp $ - ---- src/Makefile.in.orig Sat Sep 1 23:42:27 2001 -+++ src/Makefile.in Mon Sep 3 18:37:07 2001 -@@ -22,7 +22,7 @@ +--- src/Makefile.in.orig Sun Sep 16 04:02:31 2001 ++++ src/Makefile.in Sat Oct 20 00:05:14 2001 +@@ -20,9 +20,9 @@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ - sbindir = @sbindir@ +-sbindir = @sbindir@ ++sbindir = @bindir@ libexecdir = @libexecdir@ -datadir = @datadir@ +datadir = @datadir@/gdkxft sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ -@@ -96,7 +96,7 @@ +@@ -121,7 +121,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -20,4 +20,4 @@ +libgdkxft_la_LDFLAGS = -avoid-version libgdkxft_la_LIBADD = libgdkxft_la_OBJECTS = gdkxft.lo realfuncs.lo - SCRIPTS = $(bin_SCRIPTS) + SCRIPTS = $(sbin_SCRIPTS) diff -ruN gdkxft/files/patch-src::gdkxft.c gdkxft-new/files/patch-src::gdkxft.c --- gdkxft/files/patch-src::gdkxft.c Tue Sep 4 00:54:28 2001 +++ gdkxft-new/files/patch-src::gdkxft.c Fri Oct 19 23:48:23 2001 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-src::gdkxft.c,v 1.1 2001/09/03 16:54:28 sobomax Exp $ - ---- src/gdkxft.c.orig Sat Sep 1 19:00:02 2001 -+++ src/gdkxft.c Mon Sep 3 18:34:29 2001 +--- src/gdkxft.c.orig Fri Oct 19 23:18:39 2001 ++++ src/gdkxft.c Fri Oct 19 23:20:03 2001 @@ -20,7 +20,7 @@ #include <stdio.h> #include <stdlib.h> @@ -12,12 +9,12 @@ #include <X11/Xlib.h> #include <X11/Xos.h> -@@ -170,7 +170,7 @@ +@@ -181,7 +181,7 @@ else if(!access(SYSCONFDIR "/gdkxft.conf",R_OK)) - read_cfg_file(SYSCONFDIR "/gdkxft.conf",xfre,ftre); + read_cfg_file(SYSCONFDIR "/gdkxft.conf",xfre,ftre,apre); else -- read_cfg_file(DATADIR "/gdkxft.conf",xfre,ftre); -+ read_cfg_file(DATADIR "/gdkxft/gdkxft.conf",xfre,ftre); +- read_cfg_file(DATADIR "/gdkxft.conf",xfre,ftre,apre); ++ read_cfg_file(DATADIR "/gdkxft/gdkxft.conf",xfre,ftre,apre); /* compile regexps */ g_string_append_c(xfre,'$'); diff -ruN gdkxft/files/patch-src::gdkxft.conf gdkxft-new/files/patch-src::gdkxft.conf --- gdkxft/files/patch-src::gdkxft.conf Tue Sep 4 00:54:28 2001 +++ gdkxft-new/files/patch-src::gdkxft.conf Sat Oct 20 00:56:43 2001 @@ -1,12 +1,11 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-src::gdkxft.conf,v 1.1 2001/09/03 16:54:28 sobomax Exp $ - ---- src/gdkxft.conf 2001/09/03 16:40:47 1.1 -+++ src/gdkxft.conf 2001/09/03 16:41:01 -@@ -1,5 +1,3 @@ - !* +--- src/gdkxft.conf.orig Sat Sep 8 20:42:18 2001 ++++ src/gdkxft.conf Sat Oct 20 00:55:54 2001 +@@ -1,6 +1,3 @@ + &*mozilla-bin +-!* --urw-* --b&h-* --abisource-* +--macromedia-* +-*-* - ++ diff -ruN gdkxft/files/patch-src::gdkxft_sysinstall.in gdkxft-new/files/patch-src::gdkxft_sysinstall.in --- gdkxft/files/patch-src::gdkxft_sysinstall.in Wed Sep 5 16:22:11 2001 +++ gdkxft-new/files/patch-src::gdkxft_sysinstall.in Fri Oct 19 23:48:55 2001 @@ -1,41 +1,18 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in,v 1.3 2001/09/05 08:22:11 sobomax Exp $ - ---- src/gdkxft_sysinstall.in.orig Tue Sep 4 15:29:48 2001 -+++ src/gdkxft_sysinstall.in Wed Sep 5 11:16:07 2001 -@@ -274,7 +274,7 @@ - $xfttop=<XFT>; - close(XFT); - }; -- if(!($xfttop =~ /\$XFree86\$/)) { -+ if(!($xfttop =~ /\$XFree86.*\$/)) { - print STDERR "Your $outfile is already configured.\n"; - return; - } -@@ -434,7 +434,7 @@ +--- src/gdkxft_sysinstall.in.orig Fri Oct 19 23:30:23 2001 ++++ src/gdkxft_sysinstall.in Fri Oct 19 23:32:59 2001 +@@ -561,7 +561,7 @@ # create a theme to show off anti-aliased fonts - sub install_theme { + sub install_theme () { - my $themedir=`gtk-config --prefix` || "/usr"; + my $themedir=`gtk12-config --prefix` || "/usr"; chomp $themedir; $themedir.="/share/themes"; -@@ -443,8 +443,8 @@ - return 0; - }; - -- mkdir "$themedir/Gdkxft"; -- mkdir "$themedir/Gdkxft/gtk"; -+ mkdir "$themedir/Gdkxft", 0755; -+ mkdir "$themedir/Gdkxft/gtk", 0755; - my $file = "$themedir/Gdkxft/gtk/gtkrc"; - - print STDERR "Creating $file\n"; -@@ -500,7 +500,7 @@ +@@ -627,7 +627,7 @@ return 1; } - sub uninstall_theme { + sub uninstall_theme () { - my $themedir=`gtk-config --prefix` || "/usr"; + my $themedir=`gtk12-config --prefix` || "/usr"; chomp $themedir; diff -ruN gdkxft/files/patch-src::generate.pl gdkxft-new/files/patch-src::generate.pl --- gdkxft/files/patch-src::generate.pl Tue Sep 4 00:54:28 2001 +++ gdkxft-new/files/patch-src::generate.pl Fri Oct 19 23:49:06 2001 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/x11/gdkxft/files/patch-src::generate.pl,v 1.1 2001/09/03 16:54:28 sobomax Exp $ - ---- src/generate.pl 2001/09/03 15:18:41 1.1 -+++ src/generate.pl 2001/09/03 15:19:10 +--- src/generate.pl.orig Fri Oct 19 23:33:58 2001 ++++ src/generate.pl Fri Oct 19 23:34:23 2001 @@ -273,7 +273,7 @@ $indent = $ENV{INDENT}; $indent = "indent" unless $indent; diff -ruN gdkxft/pkg-plist gdkxft-new/pkg-plist --- gdkxft/pkg-plist Tue Sep 4 00:54:27 2001 +++ gdkxft-new/pkg-plist Sat Oct 20 00:57:34 2001 @@ -1,6 +1,10 @@ +bin/gdkxft-capplet bin/gdkxft_sysinstall +/etc/gdkxft.conf lib/libgdkxft.so +man/man8/gdkxft_sysinstall.8 share/doc/gdkxft/README -share/gdkxft/gdkxft.conf -@dirrm share/gdkxft +share/gdkxft-capplet.glade +share/gnome/control-center/UIOptions/gdkxft.desktop +share/gnome/pixmaps/gdkxft.png @dirrm share/doc/gdkxft >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?200110191725.f9JHPYt29357>