svn commit: r351108 - in head/graphics/gdk-pixbuf: . files

Tijl Coosemans tijl at FreeBSD.org
Sat Apr 12 16:29:29 UTC 2014 

Author: tijl
Date: Sat Apr 12 16:29:28 2014
New Revision: 351108
URL: http://svnweb.freebsd.org/changeset/ports/351108
QAT: https://qat.redports.org/buildarchive/r351108/

Log:
  - Remove remnants of the gnomecanvas slave port that has been removed
    several months ago.
  - Set LDFLAGS instead of LIBS and search STAGEDIR before LOCALBASE.
  - Replace a patch with REINPLACE_CMD.
  - Remove unneeded patches.

Deleted:
  head/graphics/gdk-pixbuf/files/patch-aa
  head/graphics/gdk-pixbuf/files/patch-ab
  head/graphics/gdk-pixbuf/files/patch-ad
Modified:
  head/graphics/gdk-pixbuf/Makefile
  head/graphics/gdk-pixbuf/files/patch-ac
  head/graphics/gdk-pixbuf/files/patch-ltmain.sh

Modified: head/graphics/gdk-pixbuf/Makefile
==============================================================================
--- head/graphics/gdk-pixbuf/Makefile	Sat Apr 12 15:40:38 2014	(r351107)
+++ head/graphics/gdk-pixbuf/Makefile	Sat Apr 12 16:29:28 2014	(r351108)
@@ -2,36 +2,34 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/gdk-pixbuf/Makefile,v 1.2 2006/09/10 00:51:10 mezz Exp $
 
-PORTNAME?=	gdk-pixbuf
+PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0
-PORTREVISION=	14
-CATEGORIES?=	graphics
+PORTREVISION=	15
+CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
 DISTNAME=	gdk-pixbuf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT?=	Graphic library for GTK+
+COMMENT=	Graphic library for GTK+
 
-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USES=		gmake libtool pathfix tar:bzip2
 USE_XORG=	xt xi x11
-USE_GNOME+=	gtk12
+USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -L${STAGEDIR}${PREFIX}/lib" \
-		BUILD_CANVAS="${BUILD_CANVAS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-
-BUILD_CANVAS?=	no
+LDFLAGS+=	-L${STAGEDIR}${PREFIX}/lib -L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/confexecdir =/s/=.*/= $$(sysconfdir)/' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>

Modified: head/graphics/gdk-pixbuf/files/patch-ac
==============================================================================
--- head/graphics/gdk-pixbuf/files/patch-ac	Sat Apr 12 15:40:38 2014	(r351107)
+++ head/graphics/gdk-pixbuf/files/patch-ac	Sat Apr 12 16:29:28 2014	(r351108)
@@ -1,112 +1,5 @@
 --- gdk-pixbuf/Makefile.in.orig	Sat Oct  5 01:29:29 2002
 +++ gdk-pixbuf/Makefile.in	Sat Oct  5 01:32:30 2002
-@@ -132,71 +132,71 @@
- # The PNG plugin.
- #
- libpixbufloader_png_la_SOURCES = io-png.c
--libpixbufloader_png_la_LDFLAGS = -module -avoid-version
--libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_png_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The JPEG loader
- #
- libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
--libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
--libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The XPM loader
- #
- libpixbufloader_xpm_la_SOURCES = io-xpm.c
--libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The GIF loader
- #
- libpixbufloader_gif_la_SOURCES = io-gif.c
--libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
--libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The ICO loader
- #
- libpixbufloader_ico_la_SOURCES = io-ico.c
--libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
--libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The RAS loader
- #
- libpixbufloader_ras_la_SOURCES = io-ras.c
--libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
--libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The TIFF loader
- #
- libpixbufloader_tiff_la_SOURCES = io-tiff.c
--libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
--libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The PNM loader
- #
- libpixbufloader_pnm_la_SOURCES = io-pnm.c
--libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The BMP loader
- #
- libpixbufloader_bmp_la_SOURCES = io-bmp.c
--libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
--libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- #
- # The XBM loader
- #
- libpixbufloader_xbm_la_SOURCES = io-xbm.c
--libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
- @HAVE_PNG_TRUE at PNG_LIB = @HAVE_PNG_TRUE at libpixbufloader-png.la
- 
-@@ -259,11 +259,11 @@
- 
- LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
--test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
--testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
-+testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
- testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
- testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
--testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
- 
- GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
- 
 @@ -400,7 +400,7 @@
  libpixbufloader_bmp_la_OBJECTS =  io-bmp.lo
  libpixbufloader_xbm_la_DEPENDENCIES =  libgdk_pixbuf.la

Modified: head/graphics/gdk-pixbuf/files/patch-ltmain.sh
==============================================================================
--- head/graphics/gdk-pixbuf/files/patch-ltmain.sh	Sat Apr 12 15:40:38 2014	(r351107)
+++ head/graphics/gdk-pixbuf/files/patch-ltmain.sh	Sat Apr 12 16:29:28 2014	(r351108)
@@ -8,26 +8,3 @@
  	continue
  	;;
  
-@@ -2442,6 +2443,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,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"

More information about the svn-ports-all mailing list