Date: Sun, 30 Dec 2001 03:59:34 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33338: Update port: x11/gdkxft to 1.4 Message-ID: <200112301159.fBUBxYW59057@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33338 >Category: ports >Synopsis: Update port: x11/gdkxft to 1.4 >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: Sun Dec 30 04:00:04 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.4 New file: files/patch-ltmain.sh Remove file: files/patch-configure files/patch-src::Makefile.in files/patch-src::gdkxft.c files/patch-src::gdkxft_sysinstall.in files/patch-src::generate.pl >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/gdkxft/Makefile x11/gdkxft/Makefile --- /usr/ports/x11/gdkxft/Makefile Sat Dec 15 14:34:33 2001 +++ x11/gdkxft/Makefile Sun Dec 30 00:38:44 2001 @@ -6,31 +6,56 @@ # PORTNAME= gdkxft -PORTVERSION= 1.1 +PORTVERSION= 1.4 CATEGORIES= x11 -MASTER_SITES= http://philrsss.anu.edu.au/~josh/gdkxft/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org USE_X_PREFIX= yes USE_GTK= yes -USE_LIBTOOL= yes -LIBTOOLFLAGS= --disable-ltlibs --disable-static -INSTALLS_SHLIB= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LDFLAGS=-lgnuregex -PKGMESSAGE= ${WRKDIR}/.message +CONFIGURE_ARGS= --sbindir=${PREFIX}/bin +INSTALLS_SHLIB= yes + +MAN8= gdkxft_sysinstall.8 .include <bsd.port.pre.mk> -.if $(XFREE86_VERSION) < 4 +.if ${XFREE86_VERSION} < 4 IGNORE= "requires XFree86-4.x or later to run" .endif +.if defined(HAVE_GNOME) +USE_GNOME= yes +.else +CONFIGURE_ARGS+= --without-gnome +.endif + +post-patch: + @${PERL} -pi -e 's|gtk-config --prefix|\$$GTK_CONFIG --prefix|g ; \ + s|libgdk.la|libgdk12.so|g ; \ + s|libgdk.so|libgdk12.so|g ; \ + s|GDK_DLOPEN_NAME=.*$$|GDK_DLOPEN_NAME="libgdk12.so"|g' \ + ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|src capplet|src \@BUILD_CAPPLET_TRUE\@capplet|g ; \ + s|DESTDIR\)\$$\(datadir|DESTDIR\)\$$\(pkgdatadir|g ; \ + s|/gnome/apps/|/apps/|g ; \ + s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g' +.for file in gdkxft_sysinstall.in gdkxft.c generate.pl + @${PERL} -pi -e 's|<regex.h>|<gnuregex.h>|g ; \ + s|gtk-config |${GTK_CONFIG:T} |g' ${WRKSRC}/src/${file} +.endfor + post-install: +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - @/usr/bin/printf "\nRefer to ${DOCSDIR}/README for details on how to enable gdkxft.\n\n" > \ - ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +.endif .include <bsd.port.post.mk> diff -urN /usr/ports/x11/gdkxft/distinfo x11/gdkxft/distinfo --- /usr/ports/x11/gdkxft/distinfo Thu Sep 6 00:21:05 2001 +++ x11/gdkxft/distinfo Sat Dec 29 12:49:45 2001 @@ -1 +1 @@ -MD5 (gdkxft-1.1.tar.gz) = df59414611e76d0c6d9de3ab4dd57044 +MD5 (gdkxft-1.4.tar.gz) = 6c4d593ff119020a9d737a1d76b2f8b2 diff -urN /usr/ports/x11/gdkxft/files/patch-configure x11/gdkxft/files/patch-configure --- /usr/ports/x11/gdkxft/files/patch-configure Tue Sep 4 01:54:28 2001 +++ x11/gdkxft/files/patch-configure Thu Jan 1 09:00:00 1970 @@ -1,26 +0,0 @@ - -$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 @@ - - echo $ac_n "checking for libgdk.la""... $ac_c" 1>&6 - echo "configure:1747: checking for libgdk.la" >&5 --GTK_PREFIX=`gtk-config --prefix` -+GTK_PREFIX=`$GTK_CONFIG --prefix` - GDK_LIB_PREFIX=$GTK_PREFIX/lib --GDK_LA=$GDK_LIB_PREFIX/libgdk.la -+GDK_LA=$GDK_LIB_PREFIX/libgdk12.a - 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 @@ - - echo $ac_n "checking for dlopenable libgdk.so""... $ac_c" 1>&6 - echo "configure:1757: 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 - then echo "$ac_t""not found" 1>&6 ; { echo "configure: error: can't see how to dlopen libgdk" 1>&2; exit 1; } - else echo "$ac_t""$GDK_DLOPEN_NAME" 1>&6 diff -urN /usr/ports/x11/gdkxft/files/patch-ltmain.sh x11/gdkxft/files/patch-ltmain.sh --- /usr/ports/x11/gdkxft/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970 +++ x11/gdkxft/files/patch-ltmain.sh Sat Dec 29 12:52:24 2001 @@ -0,0 +1,33 @@ +--- ltmain.sh.orig Fri Oct 26 23:15:52 2001 ++++ ltmain.sh Sat Dec 29 12:52:15 2001 +@@ -944,6 +944,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -2408,6 +2409,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4175,10 +4179,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -urN /usr/ports/x11/gdkxft/files/patch-src::Makefile.in x11/gdkxft/files/patch-src::Makefile.in --- /usr/ports/x11/gdkxft/files/patch-src::Makefile.in Tue Sep 4 01:54:28 2001 +++ x11/gdkxft/files/patch-src::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,23 +0,0 @@ - -$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 @@ - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ --datadir = @datadir@ -+datadir = @datadir@/gdkxft - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ -@@ -96,7 +96,7 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libgdkxft_la_LDFLAGS = -+libgdkxft_la_LDFLAGS = -avoid-version - libgdkxft_la_LIBADD = - libgdkxft_la_OBJECTS = gdkxft.lo realfuncs.lo - SCRIPTS = $(bin_SCRIPTS) diff -urN /usr/ports/x11/gdkxft/files/patch-src::gdkxft.c x11/gdkxft/files/patch-src::gdkxft.c --- /usr/ports/x11/gdkxft/files/patch-src::gdkxft.c Tue Sep 4 01:54:28 2001 +++ x11/gdkxft/files/patch-src::gdkxft.c Thu Jan 1 09:00:00 1970 @@ -1,23 +0,0 @@ - -$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 -@@ -20,7 +20,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <regex.h> -+#include <gnuregex.h> - - #include <X11/Xlib.h> - #include <X11/Xos.h> -@@ -170,7 +170,7 @@ - else if(!access(SYSCONFDIR "/gdkxft.conf",R_OK)) - read_cfg_file(SYSCONFDIR "/gdkxft.conf",xfre,ftre); - else -- read_cfg_file(DATADIR "/gdkxft.conf",xfre,ftre); -+ read_cfg_file(DATADIR "/gdkxft/gdkxft.conf",xfre,ftre); - - /* compile regexps */ - g_string_append_c(xfre,'$'); diff -urN /usr/ports/x11/gdkxft/files/patch-src::gdkxft.conf x11/gdkxft/files/patch-src::gdkxft.conf --- /usr/ports/x11/gdkxft/files/patch-src::gdkxft.conf Tue Sep 4 01:54:28 2001 +++ x11/gdkxft/files/patch-src::gdkxft.conf Sat Dec 29 15:44:38 2001 @@ -1,12 +1,12 @@ - -$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 Fri Nov 30 22:51:52 2001 ++++ src/gdkxft.conf Sat Dec 29 15:44:29 2001 +@@ -1,8 +1,2 @@ !* --urw-* ---b&h-* +--b&h-lucidux* --abisource-* +--abiword-* +--freefont-* +--sharefont-* +--macromedia-* +-*-* - diff -urN /usr/ports/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in x11/gdkxft/files/patch-src::gdkxft_sysinstall.in --- /usr/ports/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in Thu Sep 6 00:21:08 2001 +++ x11/gdkxft/files/patch-src::gdkxft_sysinstall.in Thu Jan 1 09:00:00 1970 @@ -1,43 +0,0 @@ - -$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 @@ - - # create a theme to show off anti-aliased fonts - 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 @@ - return 1; - } - sub uninstall_theme { -- my $themedir=`gtk-config --prefix` || "/usr"; -+ my $themedir=`gtk12-config --prefix` || "/usr"; - chomp $themedir; - $themedir.="/share/themes"; - diff -urN /usr/ports/x11/gdkxft/files/patch-src::generate.pl x11/gdkxft/files/patch-src::generate.pl --- /usr/ports/x11/gdkxft/files/patch-src::generate.pl Tue Sep 4 01:54:28 2001 +++ x11/gdkxft/files/patch-src::generate.pl Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$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 -@@ -273,7 +273,7 @@ - $indent = $ENV{INDENT}; - $indent = "indent" unless $indent; - --readgtkheader "echo '#include <$modheader>'| cpp -P `gtk-config --cflags`|"; -+readgtkheader "echo '#include <$modheader>'| cpp -P `gtk12-config --cflags`|"; - readmysource $source; - - open(OUT, "|$indent >realfuncs.h") ||die; diff -urN /usr/ports/x11/gdkxft/pkg-descr x11/gdkxft/pkg-descr --- /usr/ports/x11/gdkxft/pkg-descr Tue Sep 4 01:54:27 2001 +++ x11/gdkxft/pkg-descr Sat Dec 29 12:46:41 2001 @@ -3,4 +3,4 @@ gtk+ binary and see anti-aliased fonts in the gtk widgets. You don't need to recompile gtk+ or your applications. -WWW: http://philrsss.anu.edu.au/~josh/gdkxft/ +WWW: http://gdkxft.sourceforge.net/ diff -urN /usr/ports/x11/gdkxft/pkg-plist x11/gdkxft/pkg-plist --- /usr/ports/x11/gdkxft/pkg-plist Tue Sep 4 01:54:27 2001 +++ x11/gdkxft/pkg-plist Sat Dec 29 22:49:58 2001 @@ -1,6 +1,11 @@ +%%GNOME:%%bin/gdkxft-capplet bin/gdkxft_sysinstall +etc/gdkxft.conf lib/libgdkxft.so -share/doc/gdkxft/README -share/gdkxft/gdkxft.conf -@dirrm share/gdkxft -@dirrm share/doc/gdkxft +%%PORTDOCS%%share/doc/gdkxft/README +%%GNOME:%%share/gnome/apps/Settings/UIOptions/gdkxft.desktop +%%GNOME:%%share/gnome/control-center/UIOptions/gdkxft.desktop +%%GNOME:%%share/gnome/gdkxft/gdkxft-capplet.glade +%%GNOME:%%share/gnome/pixmaps/gdkxft.png +%%GNOME:%%@dirrm share/gnome/gdkxft +%%PORTDOCS%%@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?200112301159.fBUBxYW59057>