Date: Fri, 20 May 2011 15:49:13 +0900 From: Takefu <takefu@airport.fm> To: gnome@FreeBSD.org, freebsd-gnats-submit@freebsd.org Subject: [PATCH] devel/gobject-introspection Update 0.10.8 Message-ID: <4DD60EE9.8070403@airport.fm>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Category: ports
>Synopsis: [PATCH] devel/gobject-introspection Update 0.10.8
>Severity: non-critical
>Priority: low
>Originator: Takefu
>Release:
FreeBSD 9.0-CURRENT i386
FreeBSD 8.2-RELEASE i386
>Organization: FOX Amateur Radio Club
>Description:
- Update 0.10.8
- portlint(1) fixes
WARN: Makefile: Consider adding support for a WITHOUT_NLS knob to conditionally disable gettext support.
FATAL: Makefile: CPPFLAGS is already passed in CONFIGURE_ENV via bsd.gcc.mk. If you need to override the default value, alter CPPFLAGS in the Makefile instead with CPPFLAGS=...
WARN: Makefile: seems to have unnecessary blank lines at the last part.
FATAL: /usr/ports/devel/gobject-introspection/distinfo: [1]: unsupported checksum algorithm found: MD5.
2 fatal errors and 2 warnings found.
Port maintainer (gnome@FreeBSD.org) is cc'd.
>Fix:
--- gobject-introspection.patch begins here ---
diff -ruN /usr/ports/devel/gobject-introspection/Makefile devel/gobject-introspection/Makefile
--- /usr/ports/devel/gobject-introspection/Makefile 2011-03-08 18:01:31.000000000 +0900
+++ devel/gobject-introspection/Makefile 2011-05-20 14:20:00.000000000 +0900
@@ -7,8 +7,7 @@
#
PORTNAME= gobject-introspection
-PORTVERSION= 0.9.12
-PORTREVISION= 1
+PORTVERSION= 0.10.8
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +17,13 @@
BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
- cairo.2:${PORTSDIR}/graphics/cairo
+ cairo.2:${PORTSDIR}/graphics/cairo\
+ glib-2.0:${PORTSDIR}/devel/glib20
+
+LICENSE_COMB= dual
+LICENSE= GPLv2 LGPL20
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPL
+LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LGPL
USE_BZIP2= yes
GNU_CONFIGURE= yes
@@ -26,13 +31,10 @@
USE_GNOME= gnomehack glib20 ltverhack
USE_PYTHON= 2.5+
USE_BISON= both
-USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-tests
# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
@@ -40,6 +42,13 @@
MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
+.if defined(WITHOUT_NLS)
+PLIST_SUB+= NLS="@comment "
+.else
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.endif
+
.include <bsd.port.pre.mk>
post-patch:
@@ -47,4 +56,3 @@
${WRKSRC}/giscanner/sourcescanner.py
.include <bsd.port.post.mk>
-
diff -ruN /usr/ports/devel/gobject-introspection/distinfo devel/gobject-introspection/distinfo
--- /usr/ports/devel/gobject-introspection/distinfo 2010-11-22 08:53:23.000000000 +0900
+++ devel/gobject-introspection/distinfo 2011-05-13 15:43:46.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 260ba5e77b5c0de0e7d8faf63ecbfee7
-SHA256 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81
-SIZE (gnome2/gobject-introspection-0.9.12.tar.bz2) = 1050788
+SHA256 (gnome2/gobject-introspection-0.10.8.tar.bz2) = 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e
+SIZE (gnome2/gobject-introspection-0.10.8.tar.bz2) = 1024874
diff -ruN /usr/ports/devel/gobject-introspection/files/patch-Makefile.in devel/gobject-introspection/files/patch-Makefile.in
--- /usr/ports/devel/gobject-introspection/files/patch-Makefile.in 1970-01-01 09:00:00.000000000 +0900
+++ devel/gobject-introspection/files/patch-Makefile.in 2011-05-17 15:43:30.000000000 +0900
@@ -0,0 +1,18 @@
+--- Makefile.in.orig 2011-05-17 15:37:13.000000000 +0900
++++ Makefile.in 2011-05-17 15:43:09.000000000 +0900
+@@ -864,13 +864,13 @@
+ GLib_2_0_gir_PACKAGES = glib-2.0
+ GLib_2_0_gir_CFLAGS = \
+ -I$(GLIB_INCLUDEDIR) \
+- -I$(GLIB_LIBDIR)/glib-2.0/include \
++ -I$(GLIB_INCLUDEDIR)/.. \
+ -DGETTEXT_PACKAGE=Dummy \
+ -DGLIB_COMPILATION \
+ -D__G_I18N_LIB_H__
+
+ GLib_2_0_gir_FILES = \
+- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++ $(GLIB_INCLUDEDIR)/glibconfig.h \
+ $(GLIB_INCLUDEDIR)/glib/*.h \
+ gir/glib-2.0.c
+
diff -ruN /usr/ports/devel/gobject-introspection/files/patch-gir_Makefile.in devel/gobject-introspection/files/patch-gir_Makefile.in
--- /usr/ports/devel/gobject-introspection/files/patch-gir_Makefile.in 2010-11-22 08:53:23.000000000 +0900
+++ devel/gobject-introspection/files/patch-gir_Makefile.in 1970-01-01 09:00:00.000000000 +0900
@@ -1,18 +0,0 @@
---- gir/Makefile.in.orig 2010-09-29 01:50:46.000000000 +0000
-+++ gir/Makefile.in 2010-09-29 01:52:35.000000000 +0000
-@@ -393,13 +393,13 @@
- GLib_2_0_gir_PACKAGES = glib-2.0
- GLib_2_0_gir_CFLAGS = \
- -I$(GLIB_INCLUDEDIR) \
-- -I$(GLIB_LIBDIR)/glib-2.0/include \
-+ -I$(GLIB_INCLUDEDIR)/.. \
- -DGETTEXT_PACKAGE=Dummy \
- -DGLIB_COMPILATION \
- -D__G_I18N_LIB_H__
-
- GLib_2_0_gir_FILES = \
-- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+ $(GLIB_INCLUDEDIR)/glibconfig.h \
- $(GLIB_INCLUDEDIR)/glib/*.h \
- glib-2.0.c
-
diff -ruN /usr/ports/devel/gobject-introspection/files/patch-tests_Makefile.in devel/gobject-introspection/files/patch-tests_Makefile.in
--- /usr/ports/devel/gobject-introspection/files/patch-tests_Makefile.in 2010-11-21 00:36:34.000000000 +0900
+++ devel/gobject-introspection/files/patch-tests_Makefile.in 1970-01-01 09:00:00.000000000 +0900
@@ -1,18 +0,0 @@
---- tests/Makefile.in.orig 2010-09-21 16:31:48.000000000 +0000
-+++ tests/Makefile.in 2010-09-21 16:33:10.000000000 +0000
-@@ -819,6 +819,7 @@
- $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
- --namespace=Everything --nsversion=1.0 \
- --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
-+ --libtool="$(LIBTOOL)" \
- --library=libeverything-1.0.la --output=$@ \
- everything.h everything.c
-
-@@ -826,6 +827,7 @@
- $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
- --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
- --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
-+ --libtool="$(LIBTOOL)" \
- --library=libgimarshallingtests-1.0.la --output=$@ \
- $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
-
--- gobject-introspection.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4DD60EE9.8070403>