Date: Sun, 11 Dec 2016 17:53:52 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428372 - in head/x11: libfm libfm-extra Message-ID: <201612111753.uBBHrqwI061815@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Sun Dec 11 17:53:52 2016 New Revision: 428372 URL: https://svnweb.freebsd.org/changeset/ports/428372 Log: - Update to 1.2.5 - Adjust dependencies (reported by QA script) - Switch to USES= localbase - Remove DOCS option - Take maintainership Modified: head/x11/libfm-extra/Makefile head/x11/libfm-extra/pkg-plist head/x11/libfm/Makefile head/x11/libfm/distinfo head/x11/libfm/pkg-plist Modified: head/x11/libfm-extra/Makefile ============================================================================== --- head/x11/libfm-extra/Makefile Sun Dec 11 17:41:31 2016 (r428371) +++ head/x11/libfm-extra/Makefile Sun Dec 11 17:53:52 2016 (r428372) @@ -4,7 +4,7 @@ PORTNAME= libfm PKGNAMESUFFIX= -extra -MAINTAINER= ports@FreeBSD.org +MAINTAINER= olivierd@FreeBSD.org COMMENT= LibFM-Extra library LICENSE= LGPL21 @@ -20,6 +20,6 @@ USE_LDCONFIG= yes EXTRA_ONLY= yes -OPTIONS_EXCLUDE=DOCS NLS +OPTIONS_EXCLUDE= NLS .include "${MASTERDIR}/Makefile" Modified: head/x11/libfm-extra/pkg-plist ============================================================================== --- head/x11/libfm-extra/pkg-plist Sun Dec 11 17:41:31 2016 (r428371) +++ head/x11/libfm-extra/pkg-plist Sun Dec 11 17:53:52 2016 (r428372) @@ -2,6 +2,6 @@ include/libfm/fm-extra.h include/libfm/fm-version.h include/libfm/fm-xml-file.h lib/libfm-extra.so -lib/libfm-extra.so.%%ABI_VERSION%% -lib/libfm-extra.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm-extra.so.4 +lib/libfm-extra.so.4.0.5 libdata/pkgconfig/libfm-extra.pc Modified: head/x11/libfm/Makefile ============================================================================== --- head/x11/libfm/Makefile Sun Dec 11 17:41:31 2016 (r428371) +++ head/x11/libfm/Makefile Sun Dec 11 17:53:52 2016 (r428372) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= libfm -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= olivierd@FreeBSD.org COMMENT?= Core library of PCManFM file manager LICENSE= LGPL21 @@ -15,42 +15,42 @@ LICENSE= LGPL21 BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ valac:lang/vala LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ - libexif.so:graphics/libexif + libexif.so:graphics/libexif \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libfm-extra.so:x11/libfm-extra .endif SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra -USES= gettext-tools gmake libtool pathfix pkgconfig tar:xz +USES= gettext-tools gmake libtool localbase pathfix pkgconfig tar:xz USE_GNOME= glib20 intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .if ! defined(EXTRA_ONLY) USES+= desktop-file-utils shared-mime-info -USE_GNOME+= gtk20 +USE_GNOME+= gtk20 cairo gdkpixbuf2 CONFIGURE_ARGS+=--with-gtk=2 .else USE_GNOME+= intltool intlhack CONFIGURE_ARGS+=--with-extra-only .endif -MICRO_VERSION= 0.4 -ABI_VERSION= 4 -PLIST_SUB+= MICRO_VERSION=${MICRO_VERSION} \ - ABI_VERSION=${ABI_VERSION} - -PORTDOCS= AUTHORS NEWS README - -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls +post-extract: +.if !defined(EXTRA_ONLY) + ${MV} ${WRKSRC}/data/libfm.conf \ + ${WRKSRC}/data/libfm.conf.sample +.endif + post-patch: ${REINPLACE_CMD} -e 's|^[[:blank:]]\{5,\}USE_NLS=yes|#&|' \ ${WRKSRC}/configure @@ -59,7 +59,7 @@ post-patch: /@LN_S@ @PACKAGE@-@FMLIBVER@/d' \ ${WRKSRC}/src/Makefile.in -.if ! defined(EXTRA_ONLY) +.if !defined(EXTRA_ONLY) ${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \ ${WRKSRC}/Makefile.in @@ -74,16 +74,12 @@ post-patch: /^vfs_menu_la_LIBADD/s|$$(top.*|-lfm-extra|' \ ${WRKSRC}/src/modules/Makefile.in -post-install: - ${MV} ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf.sample + ${REINPLACE_CMD} -e 's|libfm.conf|libfm.conf.sample|' \ + ${WRKSRC}/data/Makefile.in +post-install: ${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \ ${STAGEDIR}${PREFIX}/include/${PORTNAME} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/x11/libfm/distinfo ============================================================================== --- head/x11/libfm/distinfo Sun Dec 11 17:41:31 2016 (r428371) +++ head/x11/libfm/distinfo Sun Dec 11 17:53:52 2016 (r428372) @@ -1,2 +1,3 @@ -SHA256 (libfm-1.2.4.tar.xz) = 7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f -SIZE (libfm-1.2.4.tar.xz) = 912164 +TIMESTAMP = 1481474043 +SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a +SIZE (libfm-1.2.5.tar.xz) = 912740 Modified: head/x11/libfm/pkg-plist ============================================================================== --- head/x11/libfm/pkg-plist Sun Dec 11 17:41:31 2016 (r428371) +++ head/x11/libfm/pkg-plist Sun Dec 11 17:53:52 2016 (r428372) @@ -68,11 +68,11 @@ include/libfm/fm-thumbnailer.h include/libfm/fm-utils.h include/libfm/fm.h lib/libfm-gtk.so -lib/libfm-gtk.so.%%ABI_VERSION%% -lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm-gtk.so.4 +lib/libfm-gtk.so.4.0.5 lib/libfm.so -lib/libfm.so.%%ABI_VERSION%% -lib/libfm.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm.so.4 +lib/libfm.so.4.0.5 lib/libfm/modules/gtk-fileprop-x-desktop.so lib/libfm/modules/gtk-fileprop-x-shortcut.so lib/libfm/modules/gtk-menu-actions.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612111753.uBBHrqwI061815>