From owner-dev-commits-ports-all@freebsd.org Sun Apr 18 07:08:55 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E69BD5F3DB6; Sun, 18 Apr 2021 07:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FNLdz4MXkz4ZDC; Sun, 18 Apr 2021 07:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8340D27035; Sun, 18 Apr 2021 07:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13I78tWY094234; Sun, 18 Apr 2021 07:08:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13I78tvC094233; Sun, 18 Apr 2021 07:08:55 GMT (envelope-from git) Date: Sun, 18 Apr 2021 07:08:55 GMT Message-Id: <202104180708.13I78tvC094233@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5aad1ebd7da4 - main - graphics/dcraw: Cosmetic change MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aad1ebd7da4dbd532111738aa05cee5de274348 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Apr 2021 07:08:56 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5aad1ebd7da4dbd532111738aa05cee5de274348 commit 5aad1ebd7da4dbd532111738aa05cee5de274348 Author: Po-Chuan Hsieh AuthorDate: 2021-04-18 04:56:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-04-18 05:41:58 +0000 graphics/dcraw: Cosmetic change --- graphics/dcraw/Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index 8dbed6f35666..145843349776 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -14,29 +14,29 @@ LICENSE= GPLv2+ LIB_DEPENDS= libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 +USES= jpeg localbase tar:xz + CPPFLAGS+= -I${LOCALBASE}/include/jasper LIBS+= -ljasper -ljpeg -llcms2 -lm -USES= jpeg localbase tar:xz -PLIST_FILES= bin/${PORTNAME} \ - share/man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/dcraw \ + share/man/man1/dcraw.1.gz do-build: - @cd ${WRKSRC}/ && ${CC} -o ${PORTNAME} ${CPPFLAGS} ${CFLAGS} \ - ${PORTNAME}.c ${LDFLAGS} ${LIBS} + @cd ${WRKSRC}/ && ${CC} -o dcraw ${CPPFLAGS} ${CFLAGS} dcraw.c ${LDFLAGS} ${LIBS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/dcraw ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/dcraw.1 ${STAGEDIR}${PREFIX}/share/man/man1/ # maintainer section: -MS_DIFF= ${MS_WRKSRC}/${PORTNAME}.c.diff +MS_DIFF= ${MS_WRKSRC}/dcraw.c.diff MS_VERSION= `${CAT} ${MS_VERSIONFILE}` MS_VERSIONFILE= ${MS_WRKSRC}/.version MS_WRKSRC= ${WRKSRC}/tmp MS_MASTER_SITE= https://www.cybercom.net/~dcoffin/dcraw/ -MS_DISTFILES= ${PORTNAME}.1 ${PORTNAME}.c +MS_DISTFILES= dcraw.1 dcraw.c maketar: do-clean extract @${MKDIR} ${MS_WRKSRC}/ @@ -44,17 +44,17 @@ maketar: do-clean extract @${FETCH_CMD} -o ${MS_WRKSRC}/${file} ${MS_MASTER_SITE}${file} .endfor @${GREP} '^#define DCRAW_VERSION' ${MS_WRKSRC}/dcraw.c | cut -d'"' -f2 > ${MS_VERSIONFILE} - @${MKDIR} -m 755 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/ - @cd ${MS_WRKSRC}/ && ${CHMOD} 644 ${MS_DISTFILES} && ${MV} ${MS_DISTFILES} ${PORTNAME}-${MS_VERSION}/ - @(${DIFF} -u ${WRKSRC}/${PORTNAME}.c ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/${PORTNAME}.c > ${MS_DIFF}) || ${TRUE} + @${MKDIR} -m 755 ${MS_WRKSRC}/dcraw-${MS_VERSION}/ + @cd ${MS_WRKSRC}/ && ${CHMOD} 644 ${MS_DISTFILES} && ${MV} ${MS_DISTFILES} dcraw-${MS_VERSION}/ + @(${DIFF} -u ${WRKSRC}/dcraw.c ${MS_WRKSRC}/dcraw-${MS_VERSION}/dcraw.c > ${MS_DIFF}) || ${TRUE} @if [ -s ${MS_DIFF} ]; then \ - cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${PORTNAME}-${MS_VERSION}.tar.xz ${PORTNAME}-${MS_VERSION}/; \ - sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/; \ + cd ${MS_WRKSRC}/ && ${TAR} -Jcf dcraw-${MS_VERSION}.tar.xz dcraw-${MS_VERSION}/; \ + sudo ${INSTALL} -m 644 ${MS_WRKSRC}/dcraw-${MS_VERSION}.tar.xz ${DISTDIR}/; \ ${SED} -i '' -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile; \ cd ${.CURDIR}/ && ${MAKE_CMD} makesum; \ ${ECHO_MSG} "*** Update from ${PORTVERSION} to ${MS_VERSION}, diff: ${MS_DIFF} ***"; \ else \ - ${ECHO_MSG} "*** ${MS_MASTER_SITE}${PORTNAME}.c is unchanged (${PORTVERSION}) ***"; \ + ${ECHO_MSG} "*** ${MS_MASTER_SITE}dcraw.c is unchanged (${PORTVERSION}) ***"; \ fi .include