From owner-svn-ports-all@freebsd.org Fri Aug 17 18:06:45 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55AE8107763C; Fri, 17 Aug 2018 18:06:45 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 07F898C627; Fri, 17 Aug 2018 18:06:45 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D831A4250; Fri, 17 Aug 2018 18:06:44 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7HI6iKG071579; Fri, 17 Aug 2018 18:06:44 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7HI6idL071575; Fri, 17 Aug 2018 18:06:44 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201808171806.w7HI6idL071575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 17 Aug 2018 18:06:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477439 - in head/x11-fm/rox-filer: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/x11-fm/rox-filer: . files X-SVN-Commit-Revision: 477439 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 18:06:45 -0000 Author: pi Date: Fri Aug 17 18:06:43 2018 New Revision: 477439 URL: https://svnweb.freebsd.org/changeset/ports/477439 Log: x11-fm/rox-filer: add missing dependencies and clean Makefile - Regenerate patch files with make makepatch. - Remove useless assignment to DISTNAME. - Add a lib dependency on print/freetype2 - Add a lib dependency on x11-fonts/fontconfig - Add LICENSE= GPLv2+ - Move USES ahead of USE_* - Add gettext-runtime:build to the USES variable - Add ice to the variable USE_XORG and sort the corresponding list - Add cairo and gdkpixbuf2 to the variable USE_GNOME - Reindent the lines of the target post-configure - Split a line of the target do-install - Replace the use of ${CHMOD} 755 in Makefile with the use of @(,,755) in pkg-plist PR: 230710 Submitted by: Samy Mahmoudi Approved by: olgeni (maintainer) Modified: head/x11-fm/rox-filer/Makefile head/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in head/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure head/x11-fm/rox-filer/pkg-plist Modified: head/x11-fm/rox-filer/Makefile ============================================================================== --- head/x11-fm/rox-filer/Makefile Fri Aug 17 17:53:24 2018 (r477438) +++ head/x11-fm/rox-filer/Makefile Fri Aug 17 18:06:43 2018 (r477439) @@ -2,21 +2,24 @@ PORTNAME= rox-filer PORTVERSION= 2.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fm gnome MASTER_SITES= SF/rox/rox/${PORTVERSION} -DISTNAME= rox-filer-${PORTVERSION} MAINTAINER= olgeni@FreeBSD.org COMMENT= Simple and easy to use graphical file manager -LIB_DEPENDS= libinotify.so:devel/libinotify +LICENSE= GPLv2+ +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libinotify.so:devel/libinotify + PLIST_SUB+= LOCALBASE=${LOCALBASE} -USE_XORG= x11 sm xaw xorgproto -USE_GNOME= atk glib20 gtk20 libxml2 pango -USES= gmake pkgconfig shared-mime-info tar:bzip2 +USES= gettext-runtime:build gmake pkgconfig shared-mime-info tar:bzip2 +USE_XORG= ice sm x11 xaw xorgproto +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango GNU_CONFIGURE= yes CONFIGURE_ENV= APP_DIR=${WRKSRC}/ROX-Filer @@ -26,24 +29,30 @@ BUILD_WRKSRC= ${CONFIGURE_WRKSRC} ALL_TARGET= LIBS+= -lm +OPTIONS_DEFINE= NLS +OPTIONS_DEFAULT= NLS + +NLS_USES= gettext-runtime:run + post-configure: - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${CONFIGURE_WRKSRC}/configure \ - ${CONFIGURE_WRKSRC}/choices.c \ - ${CONFIGURE_WRKSRC}/support.c \ - ${CONFIGURE_WRKSRC}/type.c \ - ${CONFIGURE_WRKSRC}/usericons.c \ - ${CONFIGURE_WRKSRC}/xdgmime.c - @${TOUCH} ${CONFIGURE_WRKSRC}/config.status + ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ + ${CONFIGURE_WRKSRC}/configure \ + ${CONFIGURE_WRKSRC}/choices.c \ + ${CONFIGURE_WRKSRC}/support.c \ + ${CONFIGURE_WRKSRC}/type.c \ + ${CONFIGURE_WRKSRC}/usericons.c \ + ${CONFIGURE_WRKSRC}/xdgmime.c + ${TOUCH} ${CONFIGURE_WRKSRC}/config.status do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/apps/ROX-Filer - cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon AppInfo.xml AppRun Help Messages Options.xml ROX ROX-Filer Templates.ui images style.css subclasses ${STAGEDIR}${PREFIX}/apps/ROX-Filer + ${MKDIR} ${STAGEDIR}${PREFIX}/apps/ROX-Filer + cd ${WRKSRC}/ROX-Filer && ${CP} -r .DirIcon AppInfo.xml AppRun \ + Help Messages Options.xml ROX ROX-Filer Templates.ui images \ + style.css subclasses ${STAGEDIR}${PREFIX}/apps/ROX-Filer cd ${WRKSRC} && ${CP} -r Choices ${STAGEDIR}${PREFIX}/share/ ${CAT} ${FILESDIR}/rox | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${STAGEDIR}${PREFIX}/bin/rox - ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/rox ${INSTALL_MAN} ${WRKSRC}/rox.1 ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages + ${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages ${INSTALL_DATA} ${WRKSRC}/rox.xml ${STAGEDIR}${PREFIX}/share/mime/packages .include Modified: head/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in ============================================================================== --- head/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in Fri Aug 17 17:53:24 2018 (r477438) +++ head/x11-fm/rox-filer/files/patch-ROX-Filer_src_Makefile.in Fri Aug 17 18:06:43 2018 (r477439) @@ -1,6 +1,6 @@ ---- ROX-Filer/src/Makefile.in.orig 2011-10-09 16:31:59.000000000 +0200 -+++ ROX-Filer/src/Makefile.in 2018-07-31 22:30:30.674172000 +0200 -@@ -7,7 +7,7 @@ +--- ROX-Filer/src/Makefile.in.orig 2011-10-09 14:31:59 UTC ++++ ROX-Filer/src/Makefile.in +@@ -7,7 +7,7 @@ CC = @CC@ .SUFFIXES: .c .o PKG_CONFIG = @PKG_CONFIG@ @@ -9,7 +9,7 @@ #PROF = -fprofile-arcs -pg PKG_CONFIG_FLAGS= -@@ -47,10 +47,7 @@ +@@ -47,10 +47,7 @@ OBJECTS = abox.o action.o appinfo.o appm ${PROG}: ${OBJECTS} ${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS} mv "${PROG}" "${PLATFORM_DIR}" Modified: head/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure ============================================================================== --- head/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure Fri Aug 17 17:53:24 2018 (r477438) +++ head/x11-fm/rox-filer/files/patch-ROX-Filer_src_configure Fri Aug 17 18:06:43 2018 (r477439) @@ -1,6 +1,6 @@ ---- ROX-Filer/src/configure.orig +--- ROX-Filer/src/configure.orig 2011-10-09 14:32:14 UTC +++ ROX-Filer/src/configure -@@ -2134,10 +2134,6 @@ +@@ -2134,10 +2134,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" Modified: head/x11-fm/rox-filer/pkg-plist ============================================================================== --- head/x11-fm/rox-filer/pkg-plist Fri Aug 17 17:53:24 2018 (r477438) +++ head/x11-fm/rox-filer/pkg-plist Fri Aug 17 18:06:43 2018 (r477439) @@ -143,7 +143,7 @@ apps/ROX-Filer/images/rox-xattr.png apps/ROX-Filer/images/symlink.png apps/ROX-Filer/style.css apps/ROX-Filer/subclasses -bin/rox +@(,,755) bin/rox man/man1/rox.1.gz share/Choices/MIME-types/application_postscript share/Choices/MIME-types/text