Date: Fri, 30 Aug 2019 22:07:27 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510300 - head/net-im/coyim Message-ID: <201908302207.x7UM7Rh8048181@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Aug 30 22:07:27 2019 New Revision: 510300 URL: https://svnweb.freebsd.org/changeset/ports/510300 Log: net-im/coyim: Makefile cleanup - Clean up by running portlint(1) and portfmt(1) - Remove some USES=shebangfix cruft - Make better use of USES=go while here - Use ${ECHO_CMD} not ${ECHO} per bsd.commands.mk PR: 239993 Submitted by: Santhosh Raju <santhosh.raju@gmail.com> (maintainer) Modified: head/net-im/coyim/Makefile Modified: head/net-im/coyim/Makefile ============================================================================== --- head/net-im/coyim/Makefile Fri Aug 30 21:54:55 2019 (r510299) +++ head/net-im/coyim/Makefile Fri Aug 30 22:07:27 2019 (r510300) @@ -15,25 +15,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= gnome go pkgconfig shebangfix +USES= gnome go pkgconfig USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango -SHEBANG_LANG= sh -sh_OLD_CMD= "/usr/bin/env bash" -sh_CMD= /bin/sh -SHEBANG_FILES= gen_version_file.sh - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USES= gettext +NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls USE_GITHUB= yes GH_ACCOUNT= coyim GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} +GO_BUILDFLAGS= -tags ${GTK_BUILD_TAG} + SUB_LIST= PORTNAME=${PORTNAME} PLIST_FILES= bin/coyim \ @@ -43,27 +40,23 @@ PLIST_FILES= bin/coyim \ GTK_VERSION= "$$(pkg-config --modversion gtk+-3.0 | ${TR} . _ | cut -d '_' -f 1-2)" GTK_BUILD_TAG= gtk_${GTK_VERSION} -COYIM_ICON= coyim.png -COYIM_ICON_SRC= ${WRKSRC}/build/mac-bundle/coy.iconset/icon_32x32@2x.png -COYIM_DESKTOP= ${WRKSRC}/build/coyim.desktop +COYIM_ICON= coyim.png +COYIM_ICON_SRC= ${WRKSRC}/build/mac-bundle/coy.iconset/icon_32x32@2x.png +COYIM_DESKTOP= ${WRKSRC}/build/coyim.desktop INSTALLATION_DIRS+= share/applications share/pixmaps -do-build: - cd ${WRKSRC}/${GH_SUBDIR} && \ - ./gen_version_file.sh ${DISTVERSIONPREFIX}${DISTVERSION} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ - go build -tags ${GTK_BUILD_TAG} -o ${PORTNAME} +pre-build: + cd ${WRKSRC} && ${SH} ./gen_version_file.sh ${DISTVERSIONPREFIX}${DISTVERSION} post-build: @${REINPLACE_CMD} -e '/^#/d' \ -e '/^$$/d' \ ${COYIM_DESKTOP} - ${ECHO} "Exec=${PREFIX}/bin/coyim" >> ${COYIM_DESKTOP} - ${ECHO} "Icon=${COYIM_ICON}" >> ${COYIM_DESKTOP} + ${ECHO_CMD} "Exec=${PREFIX}/bin/coyim" >> ${COYIM_DESKTOP} + ${ECHO_CMD} "Icon=${COYIM_ICON}" >> ${COYIM_DESKTOP} -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +post-install: ${INSTALL_DATA} ${COYIM_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${COYIM_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${COYIM_ICON}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908302207.x7UM7Rh8048181>