svn commit: r553828 - in head/deskutils/calendar: . files

[Stefan Eßer]

Author: se
Date: Sun Nov  1 09:33:28 2020
New Revision: 553828
URL: https://svnweb.freebsd.org/changeset/ports/553828

Log:
  Pass _PATH_LOCALBASE correctly quoted to the build

Modified:
  head/deskutils/calendar/Makefile
  head/deskutils/calendar/distinfo
  head/deskutils/calendar/files/patch-pathnames.h

Modified: head/deskutils/calendar/Makefile
==============================================================================
--- head/deskutils/calendar/Makefile	Sun Nov  1 08:07:19 2020	(r553827)
+++ head/deskutils/calendar/Makefile	Sun Nov  1 09:33:28 2020	(r553828)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	calendar
-DISTVERSION=	0.7
+DISTVERSION=	0.7.1
 CATEGORIES=	deskutils
 
 MAINTAINER=	se at FreeBSD.org
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
 GH_TAGNAME=	fcc5d31
 
-CFLAGS+=	-D_PATH_LOCALBASE=\"${LOCALBASE}\"
+CFLAGS+=	-D_PATH_LOCALBASE="\"${LOCALBASE}\""
 LDFLAGS+=	-lm -lutil
 
 PLIST_FILES=	bin/calendar \

Modified: head/deskutils/calendar/distinfo
==============================================================================
--- head/deskutils/calendar/distinfo	Sun Nov  1 08:07:19 2020	(r553827)
+++ head/deskutils/calendar/distinfo	Sun Nov  1 09:33:28 2020	(r553828)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604157445
-SHA256 (bsdimp-calendar-0.7-fcc5d31_GH0.tar.gz) = ad7d0b51c4b834241aebbf6c50d187e5720f6c46c02615b27841a923e082aebc
-SIZE (bsdimp-calendar-0.7-fcc5d31_GH0.tar.gz) = 132824
+TIMESTAMP = 1604223089
+SHA256 (bsdimp-calendar-0.7.1-fcc5d31_GH0.tar.gz) = ad7d0b51c4b834241aebbf6c50d187e5720f6c46c02615b27841a923e082aebc
+SIZE (bsdimp-calendar-0.7.1-fcc5d31_GH0.tar.gz) = 132824

Modified: head/deskutils/calendar/files/patch-pathnames.h
==============================================================================
--- head/deskutils/calendar/files/patch-pathnames.h	Sun Nov  1 08:07:19 2020	(r553827)
+++ head/deskutils/calendar/files/patch-pathnames.h	Sun Nov  1 09:33:28 2020	(r553828)
@@ -1,12 +1,8 @@
 --- pathnames.h.orig	2020-10-18 03:01:26 UTC
 +++ pathnames.h
-@@ -34,4 +34,9 @@
+@@ -34,4 +34,5 @@
  
  #include <paths.h>
  
-+#ifndef	_PATH_LOCALBASE
-+#define	_PATH_LOCALBASE	"/usr/local"
-+#endif
-+
  #define	_PATH_INCLUDE	"/usr/share/calendar"
 +#define	_PATH_INCLUDE_LOCAL	_PATH_LOCALBASE "/share/calendar"