From owner-svn-ports-head@freebsd.org Tue Jul 9 09:49:20 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7091515D536C; Tue, 9 Jul 2019 09:49:20 +0000 (UTC) (envelope-from pkubaj@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 16080892C2; Tue, 9 Jul 2019 09:49:20 +0000 (UTC) (envelope-from pkubaj@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 D7F4D25F12; Tue, 9 Jul 2019 09:49:19 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x699nJNm018818; Tue, 9 Jul 2019 09:49:19 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x699nJv1018817; Tue, 9 Jul 2019 09:49:19 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201907090949.x699nJv1018817@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 9 Jul 2019 09:49:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506276 - in head/sysutils/minipro: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/sysutils/minipro: . files X-SVN-Commit-Revision: 506276 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 16080892C2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.939,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jul 2019 09:49:20 -0000 Author: pkubaj Date: Tue Jul 9 09:49:19 2019 New Revision: 506276 URL: https://svnweb.freebsd.org/changeset/ports/506276 Log: sysutils/minipro: fix build with GCC-based architectures This port needs new GCC to build on GCC architectures. Actually respect CC by putting ?= instead of =. Also respect CFLAGS and remove post-patch step, instead use a separate patch file. PR: 238515 Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D20819 Added: head/sysutils/minipro/files/ head/sysutils/minipro/files/patch-Makefile (contents, props changed) Modified: head/sysutils/minipro/Makefile Modified: head/sysutils/minipro/Makefile ============================================================================== --- head/sysutils/minipro/Makefile Tue Jul 9 09:43:42 2019 (r506275) +++ head/sysutils/minipro/Makefile Tue Jul 9 09:49:19 2019 (r506276) @@ -12,7 +12,7 @@ LICENSE= GPLv3 RUN_DEPENDS= bash:shells/bash -USES= gmake pkgconfig shebangfix +USES= compiler:c11 gmake pkgconfig shebangfix USE_GITLAB= yes GL_ACCOUNT= DavidGriffith @@ -22,11 +22,6 @@ SHEBANG_FILES= miniprohex PLIST_FILES= bin/minipro \ bin/miniprohex \ man/man1/minipro.1.gz - -post-patch: - @${REINPLACE_CMD} -e ' s|gcc|clang|g' \ - -e 's|share/||g' \ - ${WRKSRC}/Makefile post-install: @${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/minipro.1 Added: head/sysutils/minipro/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/minipro/files/patch-Makefile Tue Jul 9 09:49:19 2019 (r506276) @@ -0,0 +1,31 @@ +--- Makefile.orig 2019-02-27 06:19:06 UTC ++++ Makefile +@@ -1,16 +1,16 @@ + # Install Configuration + + # Your C compiler +-CC=gcc ++CC?=gcc + #CC=clang + + # Compiler options +-CFLAGS = -g -O0 -Wall ++CFLAGS ?= -g -O0 -Wall + + # Normally minipro is installed to /usr/local. If you want to put it + # somewhere else, define that location here. + PREFIX ?= /usr/local +-MANDIR ?= $(PREFIX)/share/man ++MANDIR ?= $(PREFIX)/man + + # Some older releases of MacOS need some extra library flags. + #EXTRA_LIBS += "-framework Foundation -framework IOKit" +@@ -58,7 +58,7 @@ OBJCOPY=objcopy + + DIST_DIR = $(MINIPRO)-$(VERSION) + BIN_INSTDIR=$(DESTDIR)$(PREFIX)/bin +-MAN_INSTDIR=$(DESTDIR)$(PREFIX)/share/man/man1 ++MAN_INSTDIR=$(DESTDIR)$(PREFIX)/man/man1 + + UDEV_DIR=$(shell $(PKG_CONFIG) --define-variable=prefix=$(PREFIX) --silence-errors --variable=udevdir udev) + UDEV_RULES_INSTDIR=$(DESTDIR)$(UDEV_DIR)/rules.d