Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Oct 2019 12:10:52 +0000 (UTC)
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514890 - in head/www/quark: . files
Message-ID:  <201910201210.x9KCAqYa083092@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: 0mp
Date: Sun Oct 20 12:10:52 2019
New Revision: 514890
URL: https://svnweb.freebsd.org/changeset/ports/514890

Log:
  Update to the latest commit
  
  - Point MASTER_SITES to FreeBSD's servers as we seem to have to host the
    distfile on our own (I wasn't able to find a way to get a tarball from
    upstream servers). Also, add a "regenerate-distfile" target to ease
    the process of updating the distfile in the future.
  - Update MAKE_ARGS: setting CC there is no longer needed.
  - Remove config.mk patches: it is sufficient for the sake of the port to
    just remove the include statement from the Makefile.
  
  Changelog:
  https://git.suckless.org/quark/log.html
  
  Reported by:	BieHDC

Deleted:
  head/www/quark/files/
Modified:
  head/www/quark/Makefile
  head/www/quark/distinfo

Modified: head/www/quark/Makefile
==============================================================================
--- head/www/quark/Makefile	Sun Oct 20 11:38:29 2019	(r514889)
+++ head/www/quark/Makefile	Sun Oct 20 12:10:52 2019	(r514890)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	quark
-DISTVERSION=	g20180403
+DISTVERSION=	g20190923
 CATEGORIES=	www
-MASTER_SITES=	https://git.suckless.org/quark/snapshot/
+MASTER_SITES=	https://people.freebsd.org/~0mp/distfiles/
 PKGNAMESUFFIX=	-server
-DISTNAME=	quark-ba38b0969f542e6e7d3f01ba500189a81ca32355
+DISTNAME=	${PKGNAME}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Small and simple HTTP GET/HEAD-only web server for static content
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	quark
 
-MAKE_ARGS=	CC=${CC} MANPREFIX=${PREFIX}/man
+MAKE_ARGS=	MANPREFIX=${PREFIX}/man
 
 PLIST_FILES=	bin/quark \
 		man/man1/quark.1.gz
@@ -27,10 +27,15 @@ PLIST_FILES=	bin/quark \
 CFLAGS+=	-D_WITH_DPRINTF
 .endif
 
+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"
 
+do-patch:
+	${REINPLACE_CMD} -e '/^include config.mk$$/d' ${WRKSRC}/Makefile
+
 post-patch:
 .if defined(QUARK_CONF)
 	@${ECHO_MSG} "Creating config.h from ${QUARK_CONF}"
@@ -39,5 +44,14 @@ post-patch:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quark
+
+regenerate-distfile:
+	${RM} -r -- ${PKGNAME}
+	git clone -n https://git.suckless.org/quark ${PKGNAME}
+	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
+	${RM} -r -- ${PKGNAME} ${PKGNAME}.tar.gz
 
 .include <bsd.port.mk>

Modified: head/www/quark/distinfo
==============================================================================
--- head/www/quark/distinfo	Sun Oct 20 11:38:29 2019	(r514889)
+++ head/www/quark/distinfo	Sun Oct 20 12:10:52 2019	(r514890)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525286635
-SHA256 (quark-ba38b0969f542e6e7d3f01ba500189a81ca32355.tar.gz) = 33764d0179cc803b99487a9eac67a0e46c555c394ede636f0868a37464a4251f
-SIZE (quark-ba38b0969f542e6e7d3f01ba500189a81ca32355.tar.gz) = 13256
+TIMESTAMP = 1571571885
+SHA256 (quark-server-g20190923.tar.gz) = 3c50e52d8e6f8f939cd02e3a94368a22c3f723606b7c486bb30cec8f1dc09b5e
+SIZE (quark-server-g20190923.tar.gz) = 14101



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910201210.x9KCAqYa083092>