diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile index a054c92c3f06..45ca3258baf6 100644 --- a/ports-mgmt/gnome-packagekit/Makefile +++ b/ports-mgmt/gnome-packagekit/Makefile @@ -12,16 +12,16 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= PackageKit client programs for the GNOME desktop BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit \ - notify:${PORTSDIR}/devel/libnotify \ - unique-1.0:${PORTSDIR}/x11-toolkits/unique \ - upower-glib:${PORTSDIR}/sysutils/upower \ - canberra-gtk:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit \ + libnotify.so:${PORTSDIR}/devel/libnotify \ + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ + libupower-glib.so:${PORTSDIR}/sysutils/upower \ + libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra -USE_BZIP2= yes USE_GNOME= gnomeprefix intlhack gconf2 gnomemenus gnomedocutils -USES= desktop-file-utils gettext iconv pathfix gmake pkgconfig +USES= desktop-file-utils gettext iconv pathfix gmake pkgconfig \ + tar:bzip2 USE_PYTHON_BUILD=2 GCONF_SCHEMAS= gnome-packagekit.schemas INSTALLS_ICONS= yes @@ -30,12 +30,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gpk-application.1 gpk-backend-status.1 gpk-install-local-file.1 \ - gpk-install-mime-type.1 gpk-install-package-name.1 \ - gpk-install-provide-file.1 gpk-prefs.1 gpk-repo.1 gpk-update-icon.1 \ - gpk-update-viewer.1 - -NO_STAGE= yes pre-configure: @${REINPLACE_CMD} -E -e 's/.*CPPFLAGS.*-Werror/#$$&/' \ -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure diff --git a/ports-mgmt/gnome-packagekit/pkg-plist b/ports-mgmt/gnome-packagekit/pkg-plist index 1f0f008fa451..d2d1e35cd38c 100644 --- a/ports-mgmt/gnome-packagekit/pkg-plist +++ b/ports-mgmt/gnome-packagekit/pkg-plist @@ -18,6 +18,16 @@ bin/gpk-update-viewer %%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.py %%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.pyc %%PYTHON_SITELIBDIR%%/packagekit/gtkwidgets.pyo +man/man1/gpk-application.1.gz +man/man1/gpk-backend-status.1.gz +man/man1/gpk-install-local-file.1.gz +man/man1/gpk-install-mime-type.1.gz +man/man1/gpk-install-package-name.1.gz +man/man1/gpk-install-provide-file.1.gz +man/man1/gpk-prefs.1.gz +man/man1/gpk-repo.1.gz +man/man1/gpk-update-icon.1.gz +man/man1/gpk-update-viewer.1.gz share/applications/gpk-application.desktop share/applications/gpk-install-catalog.desktop share/applications/gpk-install-file.desktop diff --git a/ports-mgmt/packagekit-qt4/Makefile b/ports-mgmt/packagekit-qt4/Makefile index d490bbbe3b4e..2886bb1184b4 100644 --- a/ports-mgmt/packagekit-qt4/Makefile +++ b/ports-mgmt/packagekit-qt4/Makefile @@ -15,5 +15,4 @@ INSTALL_WRKSRC= ${WRKSRC}/lib/packagekit-qt SLAVEPORT= qt4 PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index 2dcb97505623..49386090920c 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -11,18 +11,15 @@ MASTER_SITES= http://www.packagekit.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT?= DBUS packaging abstraction layer -BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ - ck-connector:${PORTSDIR}/sysutils/consolekit -RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof \ - ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ - ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info +BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ + libck-connector.so:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof -USES= gettext gmake iconv pkgconfig -USE_GNOME= glib20 intltool gnomehier +USES= gettext gmake iconv pkgconfig shared-mime-info +USE_GNOME= glib20 intltool gnomehier introspection USE_SQLITE= 3 USE_LDCONFIG= yes USE_PYTHON_BUILD= yes @@ -47,16 +44,16 @@ OPTIONS_DEFINE= PORTS MANPAGES OPTIONS_DEFAULT=PORTS PORTS_DESC=Use portupgrade for management, dummy if disabled -NO_STAGE= yes .include . if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 +PLIST_SUB+= MAN='' . else CONFIGURE_ARGS+=--disable-man-pages +PLIST_SUB+= MAN='@comment ' . endif . if ${PORT_OPTIONS:MPORTS} @@ -78,7 +75,7 @@ CONFIGURE_ARGS+=--disable-qt LIB_DEPENDS+= packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit CONFIGURE_ARGS+=--enable-qt -LIB_DEPENDS+= cppunit-1.12:${PORTSDIR}/devel/cppunit +LIB_DEPENDS+= libcppunit-1.12.so:${PORTSDIR}/devel/cppunit USE_QT4+= dbus gui xml sql moc_build #.include "${PORTSDIR}/Mk/bsd.qt.mk" .endif @@ -97,8 +94,7 @@ post-patch: post-install: .if !defined(SLAVEPORT) @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ - ${PREFIX}/share/PackageKit/transactions.db - @-update-mime-database ${PREFIX}/share/mime > /dev/null + ${STAGEDIR}${PREFIX}/share/PackageKit/transactions.db .endif .include diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist index 10601f0ad7ea..610e497d5059 100644 --- a/ports-mgmt/packagekit/pkg-plist +++ b/ports-mgmt/packagekit/pkg-plist @@ -120,6 +120,10 @@ lib/polkit-1/extensions/libpackagekit-action-lookup.so libdata/pkgconfig/packagekit-glib2.pc libexec/packagekitd libexec/pk-command-not-found +man/man1/pk-debuginfo-install.1.gz +man/man1/pkcon.1.gz +man/man1/pkgenpack.1.gz +man/man1/pkmon.1.gz %%PORTS%%share/PackageKit/helpers/ports/portsBackend.rb %%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/enums.rb %%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/prints.rb @@ -402,17 +406,12 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy @exec mkdir -p /var/cache/PackageKit/downloads @unexec rmdir /var/cache/PackageKit/downloads 2>/dev/null || true @unexec rmdir /var/cache/PackageKit 2>/dev/null || true -@unexec rmdir /var/cache 2>/dev/null || true @unexec rmdir /var/lib/PackageKit 2>/dev/null || true @unexec rmdir /var/lib 2>/dev/null || true @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @dirrmtry share/locale/sr@latin -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/bn_IN/LC_MESSAGES @@ -442,5 +441,6 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy @dirrmtry etc/PackageKit/events/pre-transaction.d @dirrmtry etc/PackageKit/events @dirrmtry etc/PackageKit -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@cwd / +@comment /var/lib/PackageKit/transactions.db +@cwd