Date: Tue, 13 Mar 2018 14:13:26 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464377 - in head/devel/bsdcflow: . files Message-ID: <201803131413.w2DEDQBE039305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Mar 13 14:13:26 2018 New Revision: 464377 URL: https://svnweb.freebsd.org/changeset/ports/464377 Log: - Simplify and fix installation, use BSD_* commands, switch to pkg-plist, use WRKSRC_SUBDIR Added: head/devel/bsdcflow/files/patch-Makefile - copied, changed from r464376, head/devel/bsdcflow/files/patch-gnu_Makefile head/devel/bsdcflow/pkg-plist (contents, props changed) Deleted: head/devel/bsdcflow/files/patch-gnu_Makefile Modified: head/devel/bsdcflow/Makefile Modified: head/devel/bsdcflow/Makefile ============================================================================== --- head/devel/bsdcflow/Makefile Tue Mar 13 14:11:42 2018 (r464376) +++ head/devel/bsdcflow/Makefile Tue Mar 13 14:13:26 2018 (r464377) @@ -17,12 +17,7 @@ CONFLICTS= gnucflow-[0-9]* cflow-[0-9]* USES= gmake MAKE_ENV= MANDIR=${PREFIX}/man MAKE_JOBS_UNSAFE= yes - -PLIST_FILES= bin/asmgraph bin/cgraph bin/cflow \ - man/man1/asmgraph.1.gz man/man1/cflow.1.gz \ - man/man1/cgraph.1.gz - -WRKSRC= ${WRKDIR}/${DISTNAME}/gnu +WRKSRC_SUBDIR= gnu post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cgraph Copied and modified: head/devel/bsdcflow/files/patch-Makefile (from r464376, head/devel/bsdcflow/files/patch-gnu_Makefile) ============================================================================== --- head/devel/bsdcflow/files/patch-gnu_Makefile Tue Mar 13 14:11:42 2018 (r464376, copy source) +++ head/devel/bsdcflow/files/patch-Makefile Tue Mar 13 14:13:26 2018 (r464377) @@ -1,11 +1,6 @@ --- Makefile.orig 2010-04-03 09:52:16 UTC +++ Makefile -@@ -1,3 +1,4 @@ -+DESTDIR?= - PREFIX?=/usr/local - MANDIR?=$(PREFIX)/share/man - MAN1DIR=$(MANDIR)/man1 -@@ -67,11 +68,11 @@ clean: +@@ -67,11 +67,11 @@ clean: $(RM) $(CFLOWMAN).gz $(CMAN).gz $(ASMMAN).gz install: mkdirs build @@ -17,11 +12,11 @@ - $(INSTALL) -c -m 0644 $(CFLOWMAN).gz $(MAN1DIR)/$(CFLOWMAN).gz - $(INSTALL) -c -m 0644 $(ASMMAN).gz $(MAN1DIR)/$(ASMMAN).gz - $(INSTALL) -c -m 0644 $(CMAN).gz $(MAN1DIR)/$(CMAN).gz -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin -+ $(INSTALL) -c -m 0755 $(CFLOW) $(DESTDIR)$(PREFIX)/bin/$(CFLOW) -+ $(INSTALL) -c -m 0755 $(ASMPROG) $(DESTDIR)$(PREFIX)/bin/$(ASMPROG) -+ $(INSTALL) -c -m 0755 $(CPROG) $(DESTDIR)$(PREFIX)/bin/$(CPROG) -+ $(INSTALL) -d $(DESTDIR)$(MAN1DIR) -+ $(INSTALL) -c -m 0644 $(CFLOWMAN).gz $(DESTDIR)$(MAN1DIR)/$(CFLOWMAN).gz -+ $(INSTALL) -c -m 0644 $(ASMMAN).gz $(DESTDIR)$(MAN1DIR)/$(ASMMAN).gz -+ $(INSTALL) -c -m 0644 $(CMAN).gz $(DESTDIR)$(MAN1DIR)/$(CMAN).gz ++ $(MKDIR) $(DESTDIR)$(PREFIX)/bin ++ $(BSD_INSTALL_SCRIPT) $(CFLOW) $(DESTDIR)$(PREFIX)/bin/$(CFLOW) ++ $(BSD_INSTALL_PROGRAM) $(ASMPROG) $(DESTDIR)$(PREFIX)/bin/$(ASMPROG) ++ $(BSD_INSTALL_PROGRAM) $(CPROG) $(DESTDIR)$(PREFIX)/bin/$(CPROG) ++ $(MKDIR) $(DESTDIR)$(MAN1DIR) ++ $(BSD_INSTALL_MAN) $(CFLOWMAN).gz $(DESTDIR)$(MAN1DIR)/$(CFLOWMAN).gz ++ $(BSD_INSTALL_MAN) $(ASMMAN).gz $(DESTDIR)$(MAN1DIR)/$(ASMMAN).gz ++ $(BSD_INSTALL_MAN) $(CMAN).gz $(DESTDIR)$(MAN1DIR)/$(CMAN).gz Added: head/devel/bsdcflow/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/bsdcflow/pkg-plist Tue Mar 13 14:13:26 2018 (r464377) @@ -0,0 +1,6 @@ +bin/asmgraph +bin/cflow +bin/cgraph +man/man1/asmgraph.1.gz +man/man1/cflow.1.gz +man/man1/cgraph.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803131413.w2DEDQBE039305>