Date: Tue, 9 Jul 2019 09:49:19 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506276 - in head/sysutils/minipro: . files Message-ID: <201907090949.x699nJv1018817@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907090949.x699nJv1018817>