diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2018-03-13 14:13:26 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2018-03-13 14:13:26 +0000 |
| commit | 241359a3e1f4cc6dae6ef394a106a99919e9a757 (patch) | |
| tree | 2039d4eae875574c988ef634353c2dfd53a33f9a /devel/bsdcflow | |
| parent | d0b84518f86da2520e449d4869d3d2b5673d6110 (diff) | |
| download | ports-241359a3e1f4cc6dae6ef394a106a99919e9a757.tar.gz ports-241359a3e1f4cc6dae6ef394a106a99919e9a757.zip | |
- Simplify and fix installation, use BSD_* commands, switch to pkg-plist, use WRKSRC_SUBDIR
Notes
Notes:
svn path=/head/; revision=464377
Diffstat (limited to 'devel/bsdcflow')
| -rw-r--r-- | devel/bsdcflow/Makefile | 7 | ||||
| -rw-r--r-- | devel/bsdcflow/files/patch-Makefile | 22 | ||||
| -rw-r--r-- | devel/bsdcflow/files/patch-gnu_Makefile | 27 | ||||
| -rw-r--r-- | devel/bsdcflow/pkg-plist | 6 |
4 files changed, 29 insertions, 33 deletions
diff --git a/devel/bsdcflow/Makefile b/devel/bsdcflow/Makefile index 3a23fac4776f..f24a4a0d90df 100644 --- a/devel/bsdcflow/Makefile +++ b/devel/bsdcflow/Makefile @@ -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 diff --git a/devel/bsdcflow/files/patch-Makefile b/devel/bsdcflow/files/patch-Makefile new file mode 100644 index 000000000000..dbf98d03492f --- /dev/null +++ b/devel/bsdcflow/files/patch-Makefile @@ -0,0 +1,22 @@ +--- Makefile.orig 2010-04-03 09:52:16 UTC ++++ Makefile +@@ -67,11 +67,11 @@ clean: + $(RM) $(CFLOWMAN).gz $(CMAN).gz $(ASMMAN).gz + + install: mkdirs build +- $(INSTALL) -d $(PREFIX)/bin +- $(INSTALL) -c -m 0755 $(CFLOW) $(PREFIX)/bin/$(CFLOW) +- $(INSTALL) -c -m 0755 $(ASMPROG) $(PREFIX)/bin/$(ASMPROG) +- $(INSTALL) -c -m 0755 $(CPROG) $(PREFIX)/bin/$(CPROG) +- $(INSTALL) -d $(MAN1DIR) +- $(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 ++ $(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 diff --git a/devel/bsdcflow/files/patch-gnu_Makefile b/devel/bsdcflow/files/patch-gnu_Makefile deleted file mode 100644 index d44a988252fe..000000000000 --- a/devel/bsdcflow/files/patch-gnu_Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- 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: - $(RM) $(CFLOWMAN).gz $(CMAN).gz $(ASMMAN).gz - - install: mkdirs build -- $(INSTALL) -d $(PREFIX)/bin -- $(INSTALL) -c -m 0755 $(CFLOW) $(PREFIX)/bin/$(CFLOW) -- $(INSTALL) -c -m 0755 $(ASMPROG) $(PREFIX)/bin/$(ASMPROG) -- $(INSTALL) -c -m 0755 $(CPROG) $(PREFIX)/bin/$(CPROG) -- $(INSTALL) -d $(MAN1DIR) -- $(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 diff --git a/devel/bsdcflow/pkg-plist b/devel/bsdcflow/pkg-plist new file mode 100644 index 000000000000..ed210494d49a --- /dev/null +++ b/devel/bsdcflow/pkg-plist @@ -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 |