From owner-svn-ports-all@freebsd.org Wed Feb 26 22:25:16 2020 Return-Path: Delivered-To: svn-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 99023248CDE; Wed, 26 Feb 2020 22:25:16 +0000 (UTC) (envelope-from 0mp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48SVjj5XDMz3JKh; Wed, 26 Feb 2020 22:25:13 +0000 (UTC) (envelope-from 0mp@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 D194F6B66; Wed, 26 Feb 2020 22:25:12 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01QMPCRe073550; Wed, 26 Feb 2020 22:25:12 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01QMPCEN073549; Wed, 26 Feb 2020 22:25:12 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002262225.01QMPCEN073549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 26 Feb 2020 22:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527224 - in head/www/quark: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/www/quark: . files X-SVN-Commit-Revision: 527224 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.29 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: Wed, 26 Feb 2020 22:25:16 -0000 Author: 0mp Date: Wed Feb 26 22:25:12 2020 New Revision: 527224 URL: https://svnweb.freebsd.org/changeset/ports/527224 Log: Use patch files instead of REINPLACE_CMD REINPLACE_CMD should only be used for variables. While here: - Install manpages into the new standard directory. - Pet portfmt. - Add a not why LOCAL/0mp cannot be used at the moment. Reported by: mat Added: head/www/quark/files/ head/www/quark/files/patch-Makefile (contents, props changed) Modified: head/www/quark/Makefile Modified: head/www/quark/Makefile ============================================================================== --- head/www/quark/Makefile Wed Feb 26 22:05:47 2020 (r527223) +++ head/www/quark/Makefile Wed Feb 26 22:25:12 2020 (r527224) @@ -2,10 +2,12 @@ PORTNAME= quark DISTVERSION= g20190923 +PORTREVISION= 1 CATEGORIES= www +# XXX: See PR 244457 for details why this is not LOCAL/0mp. MASTER_SITES= https://people.freebsd.org/~0mp/distfiles/ PKGNAMESUFFIX= -server -DISTNAME= ${PKGNAME} +DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} MAINTAINER= 0mp@FreeBSD.org COMMENT= Small and simple HTTP GET/HEAD-only web server for static content @@ -15,10 +17,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= quark -MAKE_ARGS= MANPREFIX=${PREFIX}/man +MAKE_ARGS= MANPREFIX=${PREFIX}/share/man PLIST_FILES= bin/quark \ - man/man1/quark.1.gz + share/man/man1/quark.1.gz .include @@ -27,14 +29,13 @@ PLIST_FILES= bin/quark \ CFLAGS+= -D_WITH_DPRINTF .endif -COMMIT_HASH= 3c7049e9063edebbd1934178f263f9f3c9b8ddf5 +_COMMIT_HASH= 3c7049e9063edebbd1934178f263f9f3c9b8ddf5 pre-everything:: @${ECHO_MSG} "You can build quark with your own config.h using the QUARK_CONF knob:" @${ECHO_MSG} "make QUARK_CONF=/path/to/quark/config.h install clean" post-patch: - ${REINPLACE_CMD} -e '/^include config.mk$$/d' ${WRKSRC}/Makefile .if defined(QUARK_CONF) @${ECHO_MSG} "Creating config.h from ${QUARK_CONF}" @${LN} -sf ${QUARK_CONF} ${WRKSRC}/config.h @@ -43,10 +44,10 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quark -regenerate-distfile: +_regenerate-distfile: ${RM} -r -- ${PKGNAME} git clone -n https://git.suckless.org/quark ${PKGNAME} - git -C ${PKGNAME} checkout ${COMMIT_HASH} + git -C ${PKGNAME} checkout ${_COMMIT_HASH} ${RM} -r -- ${PKGNAME}/.git ${TAR} -czf ${PKGNAME}.tar.gz ${PKGNAME} scp ${PKGNAME}.tar.gz 0mp@freefall.freebsd.org:~/public_html/distfiles Added: head/www/quark/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/quark/files/patch-Makefile Wed Feb 26 22:25:12 2020 (r527224) @@ -0,0 +1,11 @@ +--- Makefile.orig 2020-02-26 22:07:21 UTC ++++ Makefile +@@ -2,7 +2,7 @@ + # quark - simple web server + .POSIX: + +-include config.mk ++#include config.mk + + COMPONENTS = util sock http resp +