Remove gtk30 dependency.

Remove unrecognized option --without-gtk-doc.
Add USE_BZIP2.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14615 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 86 insertions, 6 deletions

diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index d912bff13..29f295776 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Andreas Kohn <andreas@syndrom23.de>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libnotify/Makefile,v 1.6 2010/07/14 10:12:05 kwm Exp $
+#   $MCom: ports/devel/libnotify/Makefile,v 1.7 2010/08/06 15:45:32 avl Exp $
 #
 
 PORTNAME=	libnotify
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
@@ -18,12 +19,12 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_GNOME=	gnomehack gnometarget intlhack glib20 gtk20 gtk30 ltverhack
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget intlhack glib20 gtk20 ltverhack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
-CONFIGURE_ARGS= --without-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo
index 6e445b457..63fa1b358 100644
--- a/devel/libnotify/distinfo
+++ b/devel/libnotify/distinfo
@@ -1,3 +1,3 @@
-MD5 (libnotify-0.5.1.tar.gz) = 9a4141824d6fb451d245742d5bfac743
-SHA256 (libnotify-0.5.1.tar.gz) = a85154460c68b29e45a28b0f1d6342e84536a0edaf3a78ebc43b44f5d23c5a37
-SIZE (libnotify-0.5.1.tar.gz) = 385867
+MD5 (libnotify-0.5.1.tar.bz2) = 49c3832b445016f5772e74d788d3642f
+SHA256 (libnotify-0.5.1.tar.bz2) = 6778ec8f496d5a9c387369bd89f5b1a9a95c799cf74fd74fffe2ab52d5d2b5c5
+SIZE (libnotify-0.5.1.tar.bz2) = 308597
diff --git a/devel/libnotify/files/patch-configure b/devel/libnotify/files/patch-configure
new file mode 100644
index 000000000..94c42f07d
--- /dev/null
+++ b/devel/libnotify/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig	2010-09-20 18:47:25.000000000 +1000
++++ configure	2010-09-20 18:48:13.000000000 +1000
+@@ -10961,7 +10961,7 @@
+ 
+ 
+ 
+-if test $pkg_failed = yes; then
++if false; then
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11001,10 +11001,8 @@
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." "$LINENO" 5; }
+ else
+-	GTK3_CFLAGS=$pkg_cv_GTK3_CFLAGS
+-	GTK3_LIBS=$pkg_cv_GTK3_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
++$as_echo "disabled" >&6; }
+ 	:
+ fi
+ 
diff --git a/devel/libnotify/files/patch-tests_Makefile.in b/devel/libnotify/files/patch-tests_Makefile.in
new file mode 100644
index 000000000..caf662667
--- /dev/null
+++ b/devel/libnotify/files/patch-tests_Makefile.in
@@ -0,0 +1,56 @@
+--- tests/Makefile.in.orig	2010-09-20 18:54:10.000000000 +1000
++++ tests/Makefile.in	2010-09-20 18:54:43.000000000 +1000
+@@ -40,8 +40,7 @@
+ 	test-basic$(EXEEXT) test-error$(EXEEXT) test-markup$(EXEEXT) \
+ 	test-rtl$(EXEEXT) test-size-changes$(EXEEXT) \
+ 	test-urgency$(EXEEXT) test-xy$(EXEEXT) \
+-	test-xy-actions$(EXEEXT) test-xy-stress$(EXEEXT) \
+-	test-gtk3$(EXEEXT)
++	test-xy-actions$(EXEEXT) test-xy-stress$(EXEEXT)
+ subdir = tests
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -138,7 +137,7 @@
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo "  GEN   " $@;
+ SOURCES = $(test_basic_SOURCES) $(test_default_action_SOURCES) \
+-	$(test_error_SOURCES) $(test_gtk3_SOURCES) \
++	$(test_error_SOURCES) \
+ 	$(test_image_SOURCES) $(test_markup_SOURCES) \
+ 	$(test_multi_actions_SOURCES) $(test_replace_SOURCES) \
+ 	$(test_replace_widget_SOURCES) $(test_rtl_SOURCES) \
+@@ -146,7 +145,7 @@
+ 	$(test_urgency_SOURCES) $(test_xy_SOURCES) \
+ 	$(test_xy_actions_SOURCES) $(test_xy_stress_SOURCES)
+ DIST_SOURCES = $(test_basic_SOURCES) $(test_default_action_SOURCES) \
+-	$(test_error_SOURCES) $(test_gtk3_SOURCES) \
++	$(test_error_SOURCES) \
+ 	$(test_image_SOURCES) $(test_markup_SOURCES) \
+ 	$(test_multi_actions_SOURCES) $(test_replace_SOURCES) \
+ 	$(test_replace_widget_SOURCES) $(test_rtl_SOURCES) \
+@@ -325,7 +324,6 @@
+ test_gtk3_LDADD = $(top_builddir)/libnotify/libnotify.la $(GTK3_LIBS)
+ EXTRA_DIST = applet-critical.png
+ INCLUDES = $(PACKAGE_CFLAGS)	\
+-	$(GTK3_CFLAGS)		\
+ 	-I$(top_srcdir)
+ 
+ all: all-am
+@@ -380,9 +378,6 @@
+ test-error$(EXEEXT): $(test_error_OBJECTS) $(test_error_DEPENDENCIES) 
+ 	@rm -f test-error$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(test_error_OBJECTS) $(test_error_LDADD) $(LIBS)
+-test-gtk3$(EXEEXT): $(test_gtk3_OBJECTS) $(test_gtk3_DEPENDENCIES) 
+-	@rm -f test-gtk3$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(test_gtk3_OBJECTS) $(test_gtk3_LDADD) $(LIBS)
+ test-image$(EXEEXT): $(test_image_OBJECTS) $(test_image_DEPENDENCIES) 
+ 	@rm -f test-image$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(test_image_OBJECTS) $(test_image_LDADD) $(LIBS)
+@@ -429,7 +424,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-basic.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-default-action.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-error.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gtk3.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-image.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-markup.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-multi-actions.Po@am__quote@