ports/132076: [PATCH] multimedia/libkate: no need for gnome-libs

[Marcin Cieslak]

>Number:         132076
>Category:       ports
>Synopsis:       [PATCH] multimedia/libkate: no need for gnome-libs
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 24 20:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Marcin Cieslak
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
http://saper.info
>Environment:
System: FreeBSD radziecki.saper.info 7.1-STABLE FreeBSD 7.1-STABLE #2 r187968M: Tue Feb 17 10:52:35 CET
>Description:
libkate does not really gnome-libs, only libpng detection needs to be fixed.

somehow for me aclocal was run regnerating pretty much anything, and make in doc bailed
out with /bin/false not present.

therefore I propose to patch configure.ac and doc/Makefile.ac, too.

Added file(s):
- files/patch-configure

Port maintainer (anders at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- libkate-0.1.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/libkate.orig/Makefile /usr/ports/multimedia/libkate/Makefile
--- /usr/ports/multimedia/libkate.orig/Makefile	2008-10-18 19:33:44.000000000 +0200
+++ /usr/ports/multimedia/libkate/Makefile	2009-02-24 20:57:45.350394786 +0100
@@ -19,7 +19,7 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomelibs pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include"
diff -ruN --exclude=CVS /usr/ports/multimedia/libkate.orig/files/patch-configure /usr/ports/multimedia/libkate/files/patch-configure
--- /usr/ports/multimedia/libkate.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/multimedia/libkate/files/patch-configure	2009-02-24 21:10:04.398742460 +0100
@@ -0,0 +1,57 @@
+--- configure.ac.orig	2009-02-24 21:09:08.163145301 +0100
++++ configure.ac	2009-02-24 21:09:15.297835756 +0100
+@@ -146,7 +146,7 @@
+ 
+ if test "x$HAVE_PKG_CONFIG" = "xyes"
+ then
+-  PKG_CHECK_MODULES(PNG, libpng, HAVE_PNG=yes, HAVE_PNG=no)
++  PKG_CHECK_MODULES(PNG, libpng12, HAVE_PNG=yes, HAVE_PNG=no)
+ fi
+ if test "x$HAVE_PNG" = "xno"
+ then
+--- configure.orig	2009-02-24 21:07:42.167960243 +0100
++++ configure	2009-02-24 21:08:32.375712051 +0100
+@@ -22779,12 +22779,12 @@
+         pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
++  pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22797,12 +22797,12 @@
+         pkg_cv_PNG_LIBS="$PNG_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
++  pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22821,9 +22821,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng12"`
+         else
+-	        PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
++	        PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PNG_PKG_ERRORS" >&5
diff -ruN --exclude=CVS /usr/ports/multimedia/libkate.orig/files/patch-doc-Makefile.in /usr/ports/multimedia/libkate/files/patch-doc-Makefile.in
--- /usr/ports/multimedia/libkate.orig/files/patch-doc-Makefile.in	2008-10-18 19:33:44.000000000 +0200
+++ /usr/ports/multimedia/libkate/files/patch-doc-Makefile.in	2009-02-24 21:20:51.212345295 +0100
@@ -1,12 +1,28 @@
---- doc/Makefile.in.orig	Tue Sep  9 08:52:20 2008
-+++ doc/Makefile.in	Sat Oct 18 17:51:51 2008
-@@ -447,8 +447,7 @@
- @HAVE_DOXYGEN_TRUE@	doxygen kate.doxygen
+--- doc/Makefile.in.orig	2008-09-09 08:52:20.000000000 +0200
++++ doc/Makefile.in	2009-02-24 21:16:57.654028916 +0100
+@@ -189,6 +189,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ LIBTOOLFLAGS = --silent
+@@ -448,7 +449,6 @@
  @HAVE_DOXYGEN_TRUE@	touch .doc-dummy-target
  @HAVE_DOXYGEN_FALSE at .doc-dummy-target:
-- at HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
+ @HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
 - at HAVE_DOXYGEN_FALSE@	/bin/false
-+ at HAVE_DOXYGEN_FALSE@	echo "doxygen not found, oops"
  
  dist-hook: .doc-dummy-target
  	cp -fR * $(distdir)
+--- doc/Makefile.am.orig	2009-02-24 21:20:13.810532239 +0100
++++ doc/Makefile.am	2009-02-24 21:20:25.953144857 +0100
+@@ -35,7 +35,6 @@
+ else
+ .doc-dummy-target:
+ 	echo "doxygen not found, cannot build docs"
+-	/bin/false
+ endif
+ 
+ dist-hook: .doc-dummy-target
--- libkate-0.1.12.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: