Attachment #94024 for bug #132076

View | Details | Raw Unified | Return to bug 132076
Collapse All | Expand All

Lines 19-25 Link Here

(-)/usr/ports/multimedia/libkate/Makefile (-1 / +1 lines)
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	USE_GNOME= gnomelibs pkgconfig	22	USE_GNOME= pkgconfig
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24		24
25	CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include"	25	CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include"




--- 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




--- 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@.doc-dummy-target:
 @HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
-@HAVE_DOXYGEN_FALSE@	/bin/false
+@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

Return to bug 132076

Line 0 Link Here

(-)/usr/ports/multimedia/libkate/files/patch-configure (+57 lines)
	1	--- configure.ac.orig 2009-02-24 21:09:08.163145301 +0100
	2	+++ configure.ac 2009-02-24 21:09:15.297835756 +0100
	3	@@ -146,7 +146,7 @@
	4
	5	if test "x$HAVE_PKG_CONFIG" = "xyes"
	6	then
	7	- PKG_CHECK_MODULES(PNG, libpng, HAVE_PNG=yes, HAVE_PNG=no)
	8	+ PKG_CHECK_MODULES(PNG, libpng12, HAVE_PNG=yes, HAVE_PNG=no)
	9	fi
	10	if test "x$HAVE_PNG" = "xno"
	11	then
	12	--- configure.orig 2009-02-24 21:07:42.167960243 +0100
	13	+++ configure 2009-02-24 21:08:32.375712051 +0100
	14	@@ -22779,12 +22779,12 @@
	15	pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
	16	else
	17	if test -n "$PKG_CONFIG" && \
	18	- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
	19	- ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
	20	+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5
	21	+ ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5
	22	ac_status=$?
	23	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	24	(exit $ac_status); }; then
	25	- pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
	26	+ pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null`
	27	else
	28	pkg_failed=yes
	29	fi
	30	@@ -22797,12 +22797,12 @@
	31	pkg_cv_PNG_LIBS="$PNG_LIBS"
	32	else
	33	if test -n "$PKG_CONFIG" && \
	34	- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
	35	- ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
	36	+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng12\"") >&5
	37	+ ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5
	38	ac_status=$?
	39	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	40	(exit $ac_status); }; then
	41	- pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
	42	+ pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null`
	43	else
	44	pkg_failed=yes
	45	fi
	46	@@ -22821,9 +22821,9 @@
	47	_pkg_short_errors_supported=no
	48	fi
	49	if test $_pkg_short_errors_supported = yes; then
	50	- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
	51	+ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng12"`
	52	else
	53	- PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
	54	+ PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng12"`
	55	fi
	56	# Put the nasty error message in config.log where it belongs
	57	echo "$PNG_PKG_ERRORS" >&5

Lines 1-12 Link Here

(-)/usr/ports/multimedia/libkate/files/patch-doc-Makefile.in (-6 / +22 lines)
1	--- doc/Makefile.in.orig Tue Sep 9 08:52:20 2008	1	--- doc/Makefile.in.orig 2008-09-09 08:52:20.000000000 +0200
2	+++ doc/Makefile.in Sat Oct 18 17:51:51 2008	2	+++ doc/Makefile.in 2009-02-24 21:16:57.654028916 +0100
3	@@ -447,8 +447,7 @@	3	@@ -189,6 +189,7 @@
4	@HAVE_DOXYGEN_TRUE@ doxygen kate.doxygen	4	target_cpu = @target_cpu@
		5	target_os = @target_os@
		6	target_vendor = @target_vendor@
		7	+top_build_prefix = @top_build_prefix@
		8	top_builddir = @top_builddir@
		9	top_srcdir = @top_srcdir@
		10	LIBTOOLFLAGS = --silent
		11	@@ -448,7 +449,6 @@
5	@HAVE_DOXYGEN_TRUE@ touch .doc-dummy-target	12	@HAVE_DOXYGEN_TRUE@ touch .doc-dummy-target
6	@HAVE_DOXYGEN_FALSE@.doc-dummy-target:	13	@HAVE_DOXYGEN_FALSE@.doc-dummy-target:
7	-@HAVE_DOXYGEN_FALSE@ echo "doxygen not found, cannot build docs"	14	@HAVE_DOXYGEN_FALSE@ echo "doxygen not found, cannot build docs"
8	-@HAVE_DOXYGEN_FALSE@ /bin/false	15	-@HAVE_DOXYGEN_FALSE@ /bin/false
9	+@HAVE_DOXYGEN_FALSE@ echo "doxygen not found, oops"
10		16
11	dist-hook: .doc-dummy-target	17	dist-hook: .doc-dummy-target
12	cp -fR * $(distdir)	18	cp -fR * $(distdir)
		19	--- doc/Makefile.am.orig 2009-02-24 21:20:13.810532239 +0100
		20	+++ doc/Makefile.am 2009-02-24 21:20:25.953144857 +0100
		21	@@ -35,7 +35,6 @@
		22	else
		23	.doc-dummy-target:
		24	echo "doxygen not found, cannot build docs"
		25	- /bin/false
		26	endif
		27
		28	dist-hook: .doc-dummy-target