Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Sep 2020 09:24:45 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547251 - head/sysutils/scalpel
Message-ID:  <202009010924.0819OjJJ077630@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Sep  1 09:24:45 2020
New Revision: 547251
URL: https://svnweb.freebsd.org/changeset/ports/547251

Log:
  Rename `__progname' to avoid the clash with the one in /usr/lib/crt1.o
  and convert the port to USES=+localbase while I'm here.
  
  Reported by:	pkg-fallout

Modified:
  head/sysutils/scalpel/Makefile

Modified: head/sysutils/scalpel/Makefile
==============================================================================
--- head/sysutils/scalpel/Makefile	Tue Sep  1 09:08:27 2020	(r547250)
+++ head/sysutils/scalpel/Makefile	Tue Sep  1 09:24:45 2020	(r547251)
@@ -14,19 +14,18 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtre.so:textproc/libtre
 
-USES=		alias
+USES=		alias localbase
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	etc/scalpel.conf.sample bin/scalpel man/man1/scalpel.1.gz
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's/#ifdef __APPLE__/#if defined(__APPLE__) || defined(__FreeBSD__)/' \
 		${WRKSRC}/src/scalpel.h
+	@${REINPLACE_CMD} -e 's,__progname,__${PORTNAME}&,' \
+		${WRKSRC}/src/scalpel.? ${WRKSRC}/src/helpers.c
 
 post-install:
 	@${CP} -p ${WRKSRC}/scalpel.conf ${STAGEDIR}${PREFIX}/etc/scalpel.conf.sample



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