diff --git a/MOVED b/MOVED --- a/MOVED +++ b/MOVED @@ -2933,3 +2933,4 @@ devel/py-pygithub|devel/py-PyGithub|2024-01-06|Rename port match upstream devel/freebsd-gcc9||2024-01-09|No longer able to build base system, use GCC 12 or later instead net/downzemall|net/arrowdl|2024-01-11|Project was renamed upstream +devel/appstream-compose||2024-01-13|Became a subpackage of devel/appstream diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile deleted file mode 100644 --- a/devel/appstream-compose/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= Compose - -COMMENT?= AppStream Compose application and library - -LIB_DEPENDS= libappstream.so:devel/appstream \ - libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libyaml.so:textproc/libyaml - -USE_GNOME= cairo gdkpixbuf2 librsvg2 pango - -MESON_ARGS= -Dcompose=true - -MASTERDIR= ${.CURDIR}/../../devel/appstream -PLIST= ${.CURDIR}/pkg-plist - -post-install: - # remove files belonging to the master port - ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist - ${FIND} ${STAGEDIR}${PREFIX} -empty -delete - ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man - -.include "${MASTERDIR}/Makefile" diff --git a/devel/appstream-compose/pkg-plist b/devel/appstream-compose/pkg-plist deleted file mode 100644 --- a/devel/appstream-compose/pkg-plist +++ /dev/null @@ -1,20 +0,0 @@ -include/appstream-compose/appstream-compose.h -include/appstream-compose/asc-canvas.h -include/appstream-compose/asc-compose.h -include/appstream-compose/asc-directory-unit.h -include/appstream-compose/asc-enums-types.h -include/appstream-compose/asc-globals.h -include/appstream-compose/asc-hint.h -include/appstream-compose/asc-icon-policy.h -include/appstream-compose/asc-image.h -include/appstream-compose/asc-result.h -include/appstream-compose/asc-unit.h -include/appstream-compose/asc-utils.h -lib/girepository-1.0/AppStreamCompose-1.0.typelib -lib/libappstream-compose.so -lib/libappstream-compose.so.0 -lib/libappstream-compose.so.1.0.0 -libdata/pkgconfig/appstream-compose.pc -libexec/appstreamcli-compose -share/gir-1.0/AppStreamCompose-1.0.gir -share/metainfo/org.freedesktop.appstream.compose.metainfo.xml diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile --- a/devel/appstream-qt/Makefile +++ b/devel/appstream-qt/Makefile @@ -27,8 +27,8 @@ post-install: # remove files belonging to the master port - ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist + ${SED} 's|@@compose@@||' ${MASTERDIR}/pkg-plist | ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% ${FIND} ${STAGEDIR}${PREFIX} -empty -delete - ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man + ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/share/man .include "${MASTERDIR}/Makefile" diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile --- a/devel/appstream/Makefile +++ b/devel/appstream/Makefile @@ -14,11 +14,16 @@ LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi +SUBPACKAGES?= compose + +SELF_DEPENDS.compose= main BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ gperf>0:devel/gperf \ itstool:textproc/itstool \ lmdb>0:databases/lmdb LIB_DEPENDS?= libcurl.so:ftp/curl \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig \ libstemmer.so:textproc/snowballstemmer \ libxmlb.so:textproc/libxmlb \ libyaml.so:textproc/libyaml \ @@ -27,11 +32,13 @@ USES+= gettext gnome localbase:ldflags meson pkgconfig \ python:build tar:xz vala:build -USE_GNOME+= glib20 introspection:build libxml2 libxslt:build +USE_GNOME= cairo gdkpixbuf2 glib20 introspection:build librsvg2 libxml2 \ + libxslt:build pango USE_LDCONFIG= yes #CFLAGS+= -D__BSD_VISIBLE=1 -MESON_ARGS+= -Dstemming=true \ +MESON_ARGS+= -Dcompose=true \ + -Dstemming=true \ -Dvapi=true \ -Dapidocs=false \ -Dinstall-docs=false \ diff --git a/devel/appstream/pkg-descr.compose b/devel/appstream/pkg-descr.compose new file mode 100644 --- /dev/null +++ b/devel/appstream/pkg-descr.compose @@ -0,0 +1,7 @@ +AppStream is a collaborative effort for making machine-readable software +metadata easily available to programs that need it. It is part of the +Freedesktop ecosystem and provides a convenient way to retrieve information +about available software. + +AppStream-compose is a library and a frontend CLI tool to scan filesystem and +generate AppStream XML. diff --git a/devel/appstream/pkg-plist b/devel/appstream/pkg-plist --- a/devel/appstream/pkg-plist +++ b/devel/appstream/pkg-plist @@ -1,4 +1,16 @@ bin/appstreamcli +@@compose@@include/appstream-compose/appstream-compose.h +@@compose@@include/appstream-compose/asc-canvas.h +@@compose@@include/appstream-compose/asc-compose.h +@@compose@@include/appstream-compose/asc-directory-unit.h +@@compose@@include/appstream-compose/asc-enums-types.h +@@compose@@include/appstream-compose/asc-globals.h +@@compose@@include/appstream-compose/asc-hint.h +@@compose@@include/appstream-compose/asc-icon-policy.h +@@compose@@include/appstream-compose/asc-image.h +@@compose@@include/appstream-compose/asc-result.h +@@compose@@include/appstream-compose/asc-unit.h +@@compose@@include/appstream-compose/asc-utils.h include/appstream/appstream.h include/appstream/as-agreement-section.h include/appstream/as-agreement.h @@ -40,15 +52,21 @@ include/appstream/as-version.h include/appstream/as-video.h lib/girepository-1.0/AppStream-1.0.typelib +@@compose@@lib/girepository-1.0/AppStreamCompose-1.0.typelib +@@compose@@lib/libappstream-compose.so +@@compose@@lib/libappstream-compose.so.0 +@@compose@@lib/libappstream-compose.so.1.0.0 lib/libappstream.so lib/libappstream.so.1.0.0 lib/libappstream.so.5 +@@compose@@libdata/pkgconfig/appstream-compose.pc libdata/pkgconfig/appstream.pc -share/man/man1/appstreamcli.1.gz +@@compose@@libexec/appstreamcli-compose share/appstream/appstream.conf share/gettext/its/metainfo.its share/gettext/its/metainfo.loc share/gir-1.0/AppStream-1.0.gir +@@compose@@share/gir-1.0/AppStreamCompose-1.0.gir share/installed-tests/appstream/metainfo-validate.test share/locale/ain/LC_MESSAGES/appstream.mo share/locale/ar/LC_MESSAGES/appstream.mo @@ -96,6 +114,9 @@ share/locale/uk/LC_MESSAGES/appstream.mo share/locale/zh_CN/LC_MESSAGES/appstream.mo share/locale/zh_TW/LC_MESSAGES/appstream.mo +@@compose@@share/man/man1/appstreamcli-compose.1.gz +share/man/man1/appstreamcli.1.gz share/metainfo/org.freedesktop.appstream.cli.metainfo.xml +@@compose@@share/metainfo/org.freedesktop.appstream.compose.metainfo.xml share/vala/vapi/appstream.deps share/vala/vapi/appstream.vapi