Attachment 160936 Details for Bug 203049 – Patch

[patch] Patch

cpmtools.patch (text/plain), 3.24 KB, created by Dmitry Marakasov on 2015-09-11 19:32:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-09-11 19:32:17 UTC

Size: 3.24 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396679)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	cpmtools
> PORTVERSION=	1.1
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	LOCAL/joerg
> DISTNAME=	cpm-${PORTVERSION}
>@@ -13,8 +14,5 @@
> 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>
>Index: files/patch-man_Makefile
>===================================================================
>--- files/patch-man_Makefile	(revision 0)
>+++ files/patch-man_Makefile	(working copy)
>@@ -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:;
>
>Property changes on: files/patch-man_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_Makefile
>===================================================================
>--- files/patch-src_Makefile	(revision 0)
>+++ files/patch-src_Makefile	(working copy)
>@@ -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)
>+ 
>
>Property changes on: files/patch-src_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 396679)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,3 @@
> bin/cpm
> man/man1/cpm.1.gz
>-lib/cpm.hlp
>+share/cpm/cpm.hlp

Actions: View | Diff

Attachments on bug 203049: 160936