[Midnightbsd-cvs] mports [16955] trunk/graphics/colord: colord 1.0.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 7 14:07:56 EDT 2014
Revision: 16955
http://svnweb.midnightbsd.org/mports/?rev=16955
Author: laffer1
Date: 2014-09-07 14:07:55 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
colord 1.0.1
Modified Paths:
--------------
trunk/graphics/colord/Makefile
trunk/graphics/colord/distinfo
trunk/graphics/colord/files/patch-Makefile.in
trunk/graphics/colord/pkg-plist
Added Paths:
-----------
trunk/graphics/colord/files/patch-configure
trunk/graphics/colord/files/patch-src_Makefile_in
Removed Paths:
-------------
trunk/graphics/colord/files/patch-client_Makefile.in
Property Changed:
----------------
trunk/graphics/colord/files/patch-Makefile.in
Modified: trunk/graphics/colord/Makefile
===================================================================
--- trunk/graphics/colord/Makefile 2014-09-07 18:00:00 UTC (rev 16954)
+++ trunk/graphics/colord/Makefile 2014-09-07 18:07:55 UTC (rev 16955)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= colord
-PORTVERSION= 0.1.20
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= graphics
MASTER_SITES= http://www.freedesktop.org/software/colord/releases/
@@ -11,42 +10,48 @@
LICENSE= gpl2
-BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
- vala-vapigen>=0.13.0:${PORTSDIR}/lang/vala-vapigen
-LIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
- dbus-1:${PORTSDIR}/devel/dbus \
- lcms2:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS= libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+ libdbus-1.so:${PORTSDIR}/devel/dbus \
+ liblcms2.so:${PORTSDIR}/graphics/lcms2
-USE_XZ= yes
-USE_GNOME= gnomehier glib20 intlhack
-USES= pathfix gettext
-USE_GMAKE= yes
-USE_SQLITE= yes
+USERS= colord
+GROUPS= colord
+
+USE_GNOME= gnomehier glib20 intlhack introspection:build
+USES= gettext gmake pathfix pkgconfig tar:xz
+USE_SQLITE= 3
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS= --disable-gudev --enable-gtk-doc-html=no --disable-gtk
+CONFIGURE_ARGS= --disable-gudev \
+ --enable-gtk-doc-html=no \
+ --disable-bash-completion \
+ --disable-gusb \
+ --disable-sane \
+ --with-daemon-user=colord \
+ --disable-systemd-login
+# takes ages we don't want to wait.
+CONFIGURE_ARGS+=--disable-print-profiles
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \
- USB_LIBS="-L/usr/lib -lusb"
-MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes
+LIBS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= USB_CFLAGS=" " USB_LIBS="-lusb"
+INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= SANE MANPAGES
+GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml
+OPTIONS_DEFINE= MANPAGES
+
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MSANE}
-CONFGIURE_ARGS+=--enable-sane=yes
-LIB_DEPENDS+= sane:${PORTSDIR}/graphics/sane-backends
-.else
-CONFIGURE_ARGS+=--disable-sane
-.endif
+# workaround for buggy handling of "@cwd" in pkg_*
+PLIST_SUB+= REALPREFIX=${PREFIX}
.if ${PORT_OPTIONS:MMANPAGES}
BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \
- ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410
-MAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
+PLIST_SUB+= MAN=""
+.else
+PLIST_SUB+= MAN="@comment "
.endif
post-patch:
@@ -57,9 +62,17 @@
-e 's|-Wmissing-parameter-type||g' \
-e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \
${WRKSRC}/configure
-.if !${PORT_OPTIONS:MMANPAGES}
+ @${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
+ -e 's|/usr/share/color|${PREFIX}/share/color|g' \
+ ${WRKSRC}/src/cd-main.c \
+ ${WRKSRC}/src/cd-profile-store.c \
+ ${WRKSRC}/src/cd-profile.c
+.if ! ${PORT_OPTIONS:MMANPAGES}
@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
.endif
+post-install:
+ @${MKDIR} ${STAGEDIR}/var/db/colord/icc
+
.include <bsd.port.mk>
Modified: trunk/graphics/colord/distinfo
===================================================================
--- trunk/graphics/colord/distinfo 2014-09-07 18:00:00 UTC (rev 16954)
+++ trunk/graphics/colord/distinfo 2014-09-07 18:07:55 UTC (rev 16955)
@@ -1,2 +1,2 @@
-SHA256 (colord-0.1.20.tar.xz) = 45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58
-SIZE (colord-0.1.20.tar.xz) = 551408
+SHA256 (colord-1.0.1.tar.xz) = 053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785
+SIZE (colord-1.0.1.tar.xz) = 1074508
Modified: trunk/graphics/colord/files/patch-Makefile.in
===================================================================
--- trunk/graphics/colord/files/patch-Makefile.in 2014-09-07 18:00:00 UTC (rev 16954)
+++ trunk/graphics/colord/files/patch-Makefile.in 2014-09-07 18:07:55 UTC (rev 16955)
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2012-05-15 23:46:55.000000000 +0200
-+++ Makefile.in 2012-05-15 23:47:27.000000000 +0200
-@@ -329,7 +329,7 @@
- # this needs libcolord and libcolord-gtk
+--- Makefile.in.orig 2013-03-29 15:05:15.000000000 +0000
++++ Makefile.in 2013-03-29 15:06:06.000000000 +0000
+@@ -387,7 +387,7 @@
+ # this needs client/cd-create-profile
- # this needs client/cd-create-profile
--SUBDIRS = etc policy man libcolord rules po $(am__append_1) client \
-+SUBDIRS = etc policy man libcolord po $(am__append_1) client \
- contrib doc examples src data
+ # this needs data/profiles/*.icc
+-SUBDIRS = etc policy man lib rules po client contrib doc examples data \
++SUBDIRS = etc policy man lib po client contrib doc examples data \
+ src
DISTCHECK_CONFIGURE_FLAGS = \
--enable-introspection \
Property changes on: trunk/graphics/colord/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/graphics/colord/files/patch-client_Makefile.in
===================================================================
--- trunk/graphics/colord/files/patch-client_Makefile.in 2014-09-07 18:00:00 UTC (rev 16954)
+++ trunk/graphics/colord/files/patch-client_Makefile.in 2014-09-07 18:07:55 UTC (rev 16955)
@@ -1,13 +0,0 @@
---- client/Makefile.in.orig 2012-05-16 20:35:37.000000000 +0200
-+++ client/Makefile.in 2012-05-16 20:35:57.000000000 +0200
-@@ -36,8 +36,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
-- cd-fix-profile$(EXEEXT)
-+ at HAVE_GTK_TRUE@bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
-+ at HAVE_GTK_TRUE@ cd-fix-profile$(EXEEXT)
- @HAVE_GTK_TRUE at noinst_PROGRAMS = colord-convert$(EXEEXT)
- subdir = client
- DIST_COMMON = $(dist_bashcompletion_DATA) $(srcdir)/Makefile.am \
Added: trunk/graphics/colord/files/patch-configure
===================================================================
--- trunk/graphics/colord/files/patch-configure (rev 0)
+++ trunk/graphics/colord/files/patch-configure 2014-09-07 18:07:55 UTC (rev 16955)
@@ -0,0 +1,11 @@
+--- configure.orig 2013-04-11 10:05:05.000000000 +0000
++++ configure 2013-04-11 10:06:38.000000000 +0000
+@@ -17763,7 +17763,7 @@
+ fi
+
+ # per-machine directory
+-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
++CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
+
+
+ ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/figures/Makefile data/profiles/Makefile data/ti1/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/plugins/Makefile src/sensors/Makefile client/Makefile lib/Makefile lib/colord/cd-version.h lib/colord/colord.pc lib/colord/Makefile lib/colorhug/Makefile lib/colorhug/colorhug.pc lib/colorhug/ch-version.h lib/dtp94/Makefile lib/huey/Makefile lib/munki/Makefile"
Added: trunk/graphics/colord/files/patch-src_Makefile_in
===================================================================
--- trunk/graphics/colord/files/patch-src_Makefile_in (rev 0)
+++ trunk/graphics/colord/files/patch-src_Makefile_in 2014-09-07 18:07:55 UTC (rev 16955)
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $
+--- src/Makefile.in.orig Thu Mar 28 11:16:10 2013
++++ src/Makefile.in Sat Mar 30 16:25:48 2013
+@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml
+ $(srcdir)/colord.gresource.xml
+
+ install-data-hook:
+- if test -w $(DESTDIR)$(prefix)/; then \
+- mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
+- chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
+- chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
+- fi
+
+ -include $(top_srcdir)/git.mk
+
Modified: trunk/graphics/colord/pkg-plist
===================================================================
--- trunk/graphics/colord/pkg-plist 2014-09-07 18:00:00 UTC (rev 16954)
+++ trunk/graphics/colord/pkg-plist 2014-09-07 18:07:55 UTC (rev 16955)
@@ -1,23 +1,38 @@
-etc/bash_completion.d/colormgr-completion.bash
+bin/cd-create-profile
+bin/cd-fix-profile
+bin/cd-iccdump
+bin/colormgr
etc/colord.conf
etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
-etc/dbus-1/system.d/org.freedesktop.colord-sane.conf
+include/colord-1/colord-private.h
+include/colord-1/colord-session/cd-session.h
include/colord-1/colord.h
-include/colord-1/colord-private.h
+include/colord-1/colord/cd-buffer.h
include/colord-1/colord/cd-client-sync.h
include/colord-1/colord/cd-client.h
include/colord-1/colord/cd-color.h
+include/colord-1/colord/cd-deprecated.h
include/colord-1/colord/cd-device-sync.h
include/colord-1/colord/cd-device.h
+include/colord-1/colord/cd-dom.h
include/colord-1/colord/cd-enum.h
+include/colord-1/colord/cd-icc.h
+include/colord-1/colord/cd-interp-akima.h
+include/colord-1/colord/cd-interp-linear.h
+include/colord-1/colord/cd-interp.h
+include/colord-1/colord/cd-it8-utils.h
include/colord-1/colord/cd-it8.h
-include/colord-1/colord/cd-it8-utils.h
include/colord-1/colord/cd-math.h
include/colord-1/colord/cd-profile-sync.h
include/colord-1/colord/cd-profile.h
+include/colord-1/colord/cd-quirk.h
include/colord-1/colord/cd-sensor-sync.h
include/colord-1/colord/cd-sensor.h
+include/colord-1/colord/cd-transform.h
include/colord-1/colord/cd-version.h
+lib/colord-sensors/libcolord_sensor_argyll.a
+lib/colord-sensors/libcolord_sensor_argyll.la
+lib/colord-sensors/libcolord_sensor_argyll.so
lib/colord-sensors/libcolord_sensor_dummy.a
lib/colord-sensors/libcolord_sensor_dummy.la
lib/colord-sensors/libcolord_sensor_dummy.so
@@ -26,17 +41,70 @@
lib/libcolord.la
lib/libcolord.so
lib/libcolord.so.1
+lib/libcolordprivate.a
+lib/libcolordprivate.la
+lib/libcolordprivate.so
+lib/libcolordprivate.so.1
libdata/pkgconfig/colord.pc
libexec/colord
-share/color/icc/colord/crayons.icc
+libexec/colord-session
+%%MAN%%man/man1/cd-create-profile.1.gz
+%%MAN%%man/man1/cd-fix-profile.1.gz
+%%MAN%%man/man1/colord.conf.1.gz
+%%MAN%%man/man1/colormgr.1.gz
+share/color/icc/colord/AdobeRGB1998.icc
+share/color/icc/colord/AppleRGB.icc
+share/color/icc/colord/BestRGB.icc
+share/color/icc/colord/BetaRGB.icc
+share/color/icc/colord/Bluish.icc
+share/color/icc/colord/BruceRGB.icc
+share/color/icc/colord/CIE-RGB.icc
+share/color/icc/colord/ColorMatchRGB.icc
+share/color/icc/colord/Crayons.icc
+share/color/icc/colord/DonRGB4.icc
+share/color/icc/colord/ECI-RGBv1.icc
+share/color/icc/colord/ECI-RGBv2.icc
+share/color/icc/colord/EktaSpacePS5.icc
+share/color/icc/colord/Gamma5000K.icc
+share/color/icc/colord/Gamma5500K.icc
+share/color/icc/colord/Gamma6500K.icc
+share/color/icc/colord/NTSC-RGB.icc
+share/color/icc/colord/PAL-RGB.icc
+share/color/icc/colord/ProPhotoRGB.icc
+share/color/icc/colord/SMPTE-C-RGB.icc
+share/color/icc/colord/SwappedRedAndGreen.icc
+share/color/icc/colord/WideGamutRGB.icc
+share/color/icc/colord/sRGB.icc
share/color/icc/colord/x11-colors.icc
+share/colord/icons/color-munki-photo-ambient.svg
+share/colord/icons/color-munki-photo-attach.svg
+share/colord/icons/color-munki-photo-calibrate.svg
+share/colord/icons/color-munki-photo-projector.svg
+share/colord/icons/color-munki-photo-screen.svg
+share/colord/icons/color-munki-smile-attach.svg
+share/colord/icons/colorhug-attach.svg
+share/colord/icons/dtp94-attach.svg
+share/colord/icons/hcfr-attach.svg
+share/colord/icons/huey-attach.svg
+share/colord/icons/i1-display3-attach.svg
+share/colord/icons/i1-monitor-attach.svg
+share/colord/icons/i1-pro-attach.svg
+share/colord/icons/spyder2-attach.svg
+share/colord/icons/spyder3-attach.svg
+share/colord/icons/spyder4-attach.svg
+share/colord/ti1/display-long.ti1
+share/colord/ti1/display-normal.ti1
+share/colord/ti1/display-short.ti1
+share/colord/ti1/printer-long.ti1
+share/colord/ti1/printer-normal.ti1
+share/colord/ti1/printer-short.ti1
+share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
-share/dbus-1/interfaces/org.freedesktop.colord.sane.xml
+share/dbus-1/services/org.freedesktop.ColorHelper.service
share/dbus-1/system-services/org.freedesktop.ColorManager.service
-share/dbus-1/system-services/org.freedesktop.colord-sane.service
share/gir-1.0/Colord-1.0.gir
share/locale/as/LC_MESSAGES/colord.mo
share/locale/bg/LC_MESSAGES/colord.mo
@@ -51,6 +119,7 @@
share/locale/eo/LC_MESSAGES/colord.mo
share/locale/es/LC_MESSAGES/colord.mo
share/locale/eu/LC_MESSAGES/colord.mo
+share/locale/fa/LC_MESSAGES/colord.mo
share/locale/fi/LC_MESSAGES/colord.mo
share/locale/fr/LC_MESSAGES/colord.mo
share/locale/ga/LC_MESSAGES/colord.mo
@@ -58,11 +127,14 @@
share/locale/gu/LC_MESSAGES/colord.mo
share/locale/he/LC_MESSAGES/colord.mo
share/locale/hi/LC_MESSAGES/colord.mo
+share/locale/hr/LC_MESSAGES/colord.mo
share/locale/hu/LC_MESSAGES/colord.mo
+share/locale/ia/LC_MESSAGES/colord.mo
share/locale/id/LC_MESSAGES/colord.mo
share/locale/it/LC_MESSAGES/colord.mo
share/locale/it_IT/LC_MESSAGES/colord.mo
share/locale/ja/LC_MESSAGES/colord.mo
+share/locale/ka/LC_MESSAGES/colord.mo
share/locale/kk/LC_MESSAGES/colord.mo
share/locale/kn/LC_MESSAGES/colord.mo
share/locale/ko/LC_MESSAGES/colord.mo
@@ -82,6 +154,7 @@
share/locale/ru/LC_MESSAGES/colord.mo
share/locale/sk/LC_MESSAGES/colord.mo
share/locale/sl/LC_MESSAGES/colord.mo
+share/locale/sq/LC_MESSAGES/colord.mo
share/locale/sr/LC_MESSAGES/colord.mo
share/locale/sr at latin/LC_MESSAGES/colord.mo
share/locale/sv/LC_MESSAGES/colord.mo
@@ -91,9 +164,11 @@
share/locale/tr/LC_MESSAGES/colord.mo
share/locale/uk/LC_MESSAGES/colord.mo
share/locale/zh_CN/LC_MESSAGES/colord.mo
+share/locale/zh_HK/LC_MESSAGES/colord.mo
share/locale/zh_TW/LC_MESSAGES/colord.mo
share/polkit-1/actions/org.freedesktop.color.policy
-share/vala/vapi/colord.vapi
+ at dirrmtry share/locale/zh_HK/LC_MESSAGES
+ at dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr at latin/LC_MESSAGES
@@ -104,6 +179,8 @@
@dirrmtry share/locale/kk
@dirrmtry share/locale/it_IT/LC_MESSAGES
@dirrmtry share/locale/it_IT
+ at dirrmtry share/locale/ia/LC_MESSAGES
+ at dirrmtry share/locale/ia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/bg_BG/LC_MESSAGES
@@ -110,10 +187,17 @@
@dirrmtry share/locale/bg_BG
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+ at dirrm share/colord/ti1
+ at dirrm share/colord/icons
+ at dirrm share/colord
@dirrm share/color/icc/colord
@dirrm share/color/icc
@dirrm share/color
@dirrm lib/colord-sensors
+ at dirrm include/colord-1/colord-session
@dirrm include/colord-1/colord
@dirrm include/colord-1
- at dirrmtry etc/bash_completion.d
+ at cwd /
+ at dirrmtry var/db/colord/icc
+ at dirrmtry var/db/colord
+ at cwd %%REALPREFIX%%
More information about the Midnightbsd-cvs
mailing list