svn commit: r398225 - in head/emulators/cpmtools: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Sep 30 17:42:54 UTC 2015
Author: amdmi3
Date: Wed Sep 30 17:42:52 2015
New Revision: 398225
URL: https://svnweb.freebsd.org/changeset/ports/398225
Log:
- Fix installed script referencing stagedir
- Install helpfile into more suitable location
- Respect CC and PREFIX
PR: 203049
Submitted by: amdmi3
Approved by: maintainer timeout (joerg, 2 weeks)
Added:
head/emulators/cpmtools/files/
head/emulators/cpmtools/files/patch-man_Makefile (contents, props changed)
head/emulators/cpmtools/files/patch-src_Makefile (contents, props changed)
Modified:
head/emulators/cpmtools/Makefile
head/emulators/cpmtools/pkg-plist
Modified: head/emulators/cpmtools/Makefile
==============================================================================
--- head/emulators/cpmtools/Makefile Wed Sep 30 17:36:56 2015 (r398224)
+++ head/emulators/cpmtools/Makefile Wed Sep 30 17:42:52 2015 (r398225)
@@ -3,6 +3,7 @@
PORTNAME= cpmtools
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= LOCAL/joerg
DISTNAME= cpm-${PORTVERSION}
@@ -13,8 +14,5 @@ COMMENT= Utility to transfer files from/
WRKSRC= ${WRKDIR}/cpm
CFLAGS+= -Wno-return-type
-MAKE_ARGS+= PREFIX=${PREFIX} DFLAG="${CFLAGS}" \
- DEST="${STAGEDIR}${PREFIX}/bin" \
- HELPFILEDIR="${STAGEDIR}${PREFIX}/lib"
.include <bsd.port.mk>
Added: head/emulators/cpmtools/files/patch-man_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/cpmtools/files/patch-man_Makefile Wed Sep 30 17:42:52 2015 (r398225)
@@ -0,0 +1,14 @@
+--- man/Makefile.orig 1994-05-28 10:56:44 UTC
++++ man/Makefile
+@@ -3,9 +3,9 @@ all:;
+ #MANEXT=n
+ MANEXT=1
+ #MANDIR=/usr/man/man${MANEXT}
+-MANDIR=/usr/local/man/man${MANEXT}
++MANDIR=${PREFIX}/man/man${MANEXT}
+
+ install:
+- cp cpm.1 ${DESTDIR}/${MANDIR}/cpm.${MANEXT}
++ ${BSD_INSTALL_MAN} cpm.1 ${DESTDIR}${MANDIR}/cpm.${MANEXT}
+
+ clean:;
Added: head/emulators/cpmtools/files/patch-src_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/cpmtools/files/patch-src_Makefile Wed Sep 30 17:42:52 2015 (r398225)
@@ -0,0 +1,42 @@
+--- src/Makefile.orig 1994-05-28 07:10:55 UTC
++++ src/Makefile
+@@ -1,14 +1,13 @@
+ #
+ # Makefile 1.8 83/07/27
+ #
+-DEST = /usr/local/bin
+-DFLAG = -g -O2
++DEST = ${PREFIX}/bin
+
+ HELPFILE = cpm.hlp
+-HELPFILEDIR = /usr/local/lib
++HELPFILEDIR = ${PREFIX}/share/cpm
+
+ # CFLAGS = -O -DVAX ${DFLAG}
+-CFLAGS = ${DFLAG} -DHELPFILE=\"$(HELPFILEDIR)/$(HELPFILE)\" # -DDEBUG
++CFLAGS += -DHELPFILE=\"$(HELPFILEDIR)/$(HELPFILE)\" # -DDEBUG
+
+ EXTHDRS = /usr/include/ctype.h \
+ /usr/include/stdio.h
+@@ -23,7 +22,7 @@ LIBLIST =
+
+ LIST = ls -C
+
+-LOADER = cc
++LOADER = ${CC}
+
+ MAKEFILE = Makefile
+
+@@ -86,9 +85,9 @@ debug:; @echo DFLAG = -g -DDEBUG > Make
+ clean:; @rm -f $(OBJS)
+
+ install: $(PROGRAM)
+- @echo Installing $(PROGRAM) in $(DEST)
+- @install -s $(PROGRAM) $(DEST)
+- @cp $(HELPFILE) $(HELPFILEDIR)
++ ${BSD_INSTALL_PROGRAM} $(PROGRAM) ${DESTDIR}$(DEST)
++ mkdir -p ${DESTDIR}$(HELPFILEDIR)
++ ${BSD_INSTALL_DATA} $(HELPFILE) ${DESTDIR}$(HELPFILEDIR)
+
+ depend:; @mkmf PROGRAM=$(PROGRAM) DEST=$(DEST)
+
Modified: head/emulators/cpmtools/pkg-plist
==============================================================================
--- head/emulators/cpmtools/pkg-plist Wed Sep 30 17:36:56 2015 (r398224)
+++ head/emulators/cpmtools/pkg-plist Wed Sep 30 17:42:52 2015 (r398225)
@@ -1,3 +1,3 @@
bin/cpm
man/man1/cpm.1.gz
-lib/cpm.hlp
+share/cpm/cpm.hlp
More information about the svn-ports-all
mailing list