Summer cleaning:
* use MODPY_ADJ_FILES * use REGRESS_FLAGS instead of 4 patches... * use post-install to remove files we don't ship, 2 less patches * install gtester-report(1) -- it's a python script but we do not enforce a run dependency on python
This commit is contained in:
ajacoutot
parent
ecccbb4dc8
commit
c871551211
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.119 2011/05/28 08:15:53 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.120 2011/05/28 21:15:47 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= general-purpose utility library
|
||||
COMMENT-docs= glib2 documentation
|
||||
@ -16,11 +16,11 @@ HOMEPAGE= http://www.gtk.org/
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
SHARED_LIBS += glib-2.0 2800.0 # 2800.4
|
||||
SHARED_LIBS += gmodule-2.0 2800.0 # 2800.4
|
||||
SHARED_LIBS += gthread-2.0 2800.0 # 2800.4
|
||||
SHARED_LIBS += gobject-2.0 2800.0 # 2800.4
|
||||
SHARED_LIBS += gio-2.0 2800.0 # 2800.4
|
||||
SHARED_LIBS += glib-2.0 2800.0 # 2800.7
|
||||
SHARED_LIBS += gmodule-2.0 2800.0 # 2800.7
|
||||
SHARED_LIBS += gthread-2.0 2800.0 # 2800.7
|
||||
SHARED_LIBS += gobject-2.0 2800.0 # 2800.7
|
||||
SHARED_LIBS += gio-2.0 2800.0 # 2800.7
|
||||
|
||||
# LGPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -36,8 +36,13 @@ MULTI_PACKAGES= -main -docs
|
||||
MODULES= devel/gettext \
|
||||
lang/python
|
||||
|
||||
# Although gtester-report(1) is a python script we do not want to force
|
||||
# a dependency on python.
|
||||
MODPY_RUNDEP= No
|
||||
MODPY_BUILDDEP= Yes # glib2 wants python for the regress tests
|
||||
# Python is needed for the regress tests.
|
||||
MODPY_BUILDDEP= Yes
|
||||
MODPY_ADJ_FILES= glib/gtester-report \
|
||||
gio/tests/gdbus-testserver.py
|
||||
|
||||
WANTLIB-main= ${WANTLIB} c pthread z pcre fam
|
||||
|
||||
@ -50,19 +55,20 @@ WANTLIB-docs=
|
||||
LIB_DEPENDS-docs=
|
||||
RUN_DEPENDS-docs=
|
||||
|
||||
# DBus is only used in the GDBus test cases
|
||||
# need X11 because DBus is used in the GDBus test cases
|
||||
BUILD_DEPENDS += x11/dbus
|
||||
REGRESS_IS_INTERACTIVE= x11
|
||||
REGRESS_FLAGS= GTESTER="${WRKBUILD}/glib/gtester -k"
|
||||
REGRESS_DEPENDS= devel/desktop-file-utils \
|
||||
devel/py-gobject \
|
||||
x11/dbus-python
|
||||
|
||||
REGRESS_FLAGS= -k
|
||||
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GROFF= Yes
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--enable-static \
|
||||
--enable-fam \
|
||||
--with-pcre=system \
|
||||
@ -82,17 +88,21 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
|
||||
|
||||
pre-configure:
|
||||
perl -pi -e "s,/usr/local,${LOCALBASE},g;" \
|
||||
-e "s,/usr/share,${LOCALBASE}/share,g;" \
|
||||
-e "s,/usr/share/locale,${LOCALBASE}/share/locale,g;" \
|
||||
-e "s,/usr/share/applications,${LOCALBASE}/share/applications,g;" \
|
||||
-e "s,/etc/xdg,${SYSCONFDIR}/xdg,g" \
|
||||
${WRKSRC}/glib/gutils.c ${WRKSRC}/gio/xdgmime/xdgmime.c \
|
||||
${WRKSRC}/gio/tests/desktop-app-info.c \
|
||||
${WRKSRC}/docs/reference/gio/html/glib-compile-schemas.html \
|
||||
${WRKSRC}/docs/reference/gio/glib-compile-schemas.1
|
||||
perl -pi -e 's,/var/lib/dbus/machine-id,${SYSCONFDIR}/dbus-1/machine-id,g' \
|
||||
perl -pi -e "s,/var/lib/dbus/machine-id,${SYSCONFDIR}/dbus-1/machine-id,g" \
|
||||
${WRKSRC}/gio/gdbusconnection.c \
|
||||
${WRKSRC}/gio/gdbusaddress.c \
|
||||
${WRKSRC}/gio/gdbusprivate.c ${WRKSRC}/po/*.po
|
||||
perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' \
|
||||
${WRKSRC}/gio/tests/gdbus-testserver.py
|
||||
${WRKSRC}/gio/gdbusprivate.c \
|
||||
${WRKSRC}/po/*.po
|
||||
|
||||
# glib's GDB macros rely on gdb(1) auto-load feature
|
||||
post-install:
|
||||
rm -rf ${PREFIX}/share/{,glib-2.0}/gdb/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.10 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
--- docs/reference/glib/Makefile.in.orig Fri Feb 18 16:21:59 2011
|
||||
+++ docs/reference/glib/Makefile.in Sat Feb 26 10:30:29 2011
|
||||
@@ -455,8 +455,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
|
||||
########################################################################
|
||||
man_MANS = \
|
||||
glib-gettextize.1 \
|
||||
- gtester.1 \
|
||||
- gtester-report.1
|
||||
+ gtester.1
|
||||
|
||||
MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
|
||||
all: all-am
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gio_tests_Makefile_in,v 1.3 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
--- gio/tests/Makefile.in.orig Mon Mar 7 18:06:41 2011
|
||||
+++ gio/tests/Makefile.in Mon Mar 7 20:01:10 2011
|
||||
@@ -1664,7 +1664,7 @@ test: test-nonrecursive
|
||||
|
||||
# test-nonrecursive: run tests only in cwd
|
||||
test-nonrecursive: ${TEST_PROGS}
|
||||
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
|
||||
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} -k --verbose ${TEST_PROGS}
|
||||
|
||||
# test-report: run tests in subdirs and generate report
|
||||
# perf-report: run tests in subdirs with -m perf and generate report
|
||||
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-glib_Makefile_in,v 1.22 2011/05/21 07:05:09 ajacoutot Exp $
|
||||
|
||||
Don't install gtester-report, it'll only pull in python.
|
||||
|
||||
--- glib/Makefile.in.orig Sat May 21 06:15:23 2011
|
||||
+++ glib/Makefile.in Sat May 21 08:55:08 2011
|
||||
@@ -781,7 +781,7 @@ INSTALL_PROGS = $(am__append_5) $(am__append_6) $(am__
|
||||
@OS_WIN32_TRUE@@OS_WIN32_X64_FALSE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
|
||||
@OS_UNIX_TRUE@gtester_SOURCES = gtester.c
|
||||
@OS_UNIX_TRUE@gtester_LDADD = libglib-2.0.la
|
||||
-@OS_UNIX_TRUE@auto_config_binscripts = gtester-report
|
||||
+@OS_UNIX_TRUE@auto_config_binscripts =
|
||||
@OS_UNIX_TRUE@bin_SCRIPTS = ${auto_config_binscripts}
|
||||
@OS_UNIX_TRUE@CONFIGVARS = \
|
||||
@OS_UNIX_TRUE@ "bindir" : "${bindir}", \
|
||||
@@ -1543,7 +1543,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
|
||||
+install-data-am: install-data-local \
|
||||
install-glibincludeHEADERS install-glibsubincludeHEADERS \
|
||||
install-tapsetDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
@@ -1828,9 +1828,7 @@ distclean-local:
|
||||
libglib-gdb.py: libglib-gdb.py.in
|
||||
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
|
||||
|
||||
-install-data-hook: libglib-gdb.py
|
||||
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
|
||||
- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
|
||||
+install-data-hook:
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-glib_tests_Makefile_in,v 1.4 2011/05/21 07:05:09 ajacoutot Exp $
|
||||
--- glib/tests/Makefile.in.orig Sat May 21 06:15:23 2011
|
||||
+++ glib/tests/Makefile.in Sat May 21 08:55:08 2011
|
||||
@@ -1052,7 +1052,7 @@ test: test-nonrecursive
|
||||
|
||||
# test-nonrecursive: run tests only in cwd
|
||||
test-nonrecursive: ${TEST_PROGS}
|
||||
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
|
||||
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} -k --verbose ${TEST_PROGS}
|
||||
|
||||
# test-report: run tests in subdirs and generate report
|
||||
# perf-report: run tests in subdirs with -m perf and generate report
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-gobject_Makefile_in,v 1.12 2011/05/21 07:05:09 ajacoutot Exp $
|
||||
--- gobject/Makefile.in.orig Sat May 21 06:15:23 2011
|
||||
+++ gobject/Makefile.in Sat May 21 08:55:08 2011
|
||||
@@ -1247,7 +1247,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
|
||||
+install-data-am: install-data-local \
|
||||
install-libgobjectincludeHEADERS install-tapsetDATA
|
||||
@$(NORMAL_INSTALL)
|
||||
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
|
||||
@@ -1519,9 +1519,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
|
||||
uninstall-gdb:
|
||||
-rm -r $(DESTDIR)$(datadir)/gdb
|
||||
|
||||
-install-data-hook: libgobject-gdb.py
|
||||
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
|
||||
- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
|
||||
+install-data-hook:
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gobject_tests_Makefile_in,v 1.3 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
--- gobject/tests/Makefile.in.orig Sat Jan 29 03:46:12 2011
|
||||
+++ gobject/tests/Makefile.in Mon Jan 31 10:14:44 2011
|
||||
@@ -689,7 +689,7 @@ test: test-nonrecursive
|
||||
|
||||
# test-nonrecursive: run tests only in cwd
|
||||
test-nonrecursive: ${TEST_PROGS}
|
||||
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
|
||||
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} -k --verbose ${TEST_PROGS}
|
||||
|
||||
# test-report: run tests in subdirs and generate report
|
||||
# perf-report: run tests in subdirs with -m perf and generate report
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gthread_Makefile_in,v 1.10 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
--- gthread/Makefile.in.orig Sat Jan 29 03:46:13 2011
|
||||
+++ gthread/Makefile.in Mon Jan 31 10:14:44 2011
|
||||
@@ -875,7 +875,7 @@ test: test-nonrecursive
|
||||
|
||||
# test-nonrecursive: run tests only in cwd
|
||||
test-nonrecursive: ${TEST_PROGS}
|
||||
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
|
||||
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} -k --verbose ${TEST_PROGS}
|
||||
|
||||
# test-report: run tests in subdirs and generate report
|
||||
# perf-report: run tests in subdirs with -m perf and generate report
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-tests_Makefile_in,v 1.19 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
$OpenBSD: patch-tests_Makefile_in,v 1.20 2011/05/28 21:15:47 ajacoutot Exp $
|
||||
--- tests/Makefile.in.orig Sat Jan 29 03:46:14 2011
|
||||
+++ tests/Makefile.in Mon Jan 31 10:14:44 2011
|
||||
@@ -643,8 +643,7 @@ test_programs = \
|
||||
@ -11,12 +11,3 @@ $OpenBSD: patch-tests_Makefile_in,v 1.19 2011/03/07 19:17:14 ajacoutot Exp $
|
||||
|
||||
test_scripts = run-collate-tests.sh run-assert-msg-test.sh
|
||||
test_script_support_programs = unicode-collate
|
||||
@@ -1407,7 +1406,7 @@ test: test-nonrecursive
|
||||
|
||||
# test-nonrecursive: run tests only in cwd
|
||||
test-nonrecursive: ${TEST_PROGS}
|
||||
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
|
||||
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} -k --verbose ${TEST_PROGS}
|
||||
|
||||
# test-report: run tests in subdirs and generate report
|
||||
# perf-report: run tests in subdirs with -m perf and generate report
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.19 2011/05/28 08:15:33 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.20 2011/05/28 21:15:47 ajacoutot Exp $
|
||||
@conflict glib2-fam-*
|
||||
@pkgpath devel/glib2
|
||||
@pkgpath devel/glib2,-fam
|
||||
@ -12,6 +12,7 @@ bin/glib-mkenums
|
||||
@bin bin/gobject-query
|
||||
@bin bin/gsettings
|
||||
@bin bin/gtester
|
||||
bin/gtester-report
|
||||
include/gio-unix-2.0/
|
||||
include/gio-unix-2.0/gio/
|
||||
include/gio-unix-2.0/gio/gdesktopappinfo.h
|
||||
@ -256,6 +257,7 @@ lib/pkgconfig/gthread-2.0.pc
|
||||
@man man/man1/glib-mkenums.1
|
||||
@man man/man1/gobject-query.1
|
||||
@man man/man1/gsettings.1
|
||||
@man man/man1/gtester-report.1
|
||||
@man man/man1/gtester.1
|
||||
share/aclocal/
|
||||
share/aclocal/glib-2.0.m4
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user