svn commit: r341040 - in head/sysutils/fonteditfs: . files

[John Marino]

Author: marino
Date: Sat Jan 25 14:38:47 2014
New Revision: 341040
URL: http://svnweb.freebsd.org/changeset/ports/341040
QAT: https://qat.redports.org/buildarchive/r341040/

Log:
  sysutils/fonteditfs: Fix on FreeBSD 10+, support stage
  
  PR:		ports/185405
  Submitted by;	Stephen Hurd
  Approved by:	maintainer (Uri Shaked)
  Staged by:	marino@

Modified:
  head/sysutils/fonteditfs/Makefile
  head/sysutils/fonteditfs/files/patch-Makefile

Modified: head/sysutils/fonteditfs/Makefile
==============================================================================
--- head/sysutils/fonteditfs/Makefile	Sat Jan 25 13:41:26 2014	(r341039)
+++ head/sysutils/fonteditfs/Makefile	Sat Jan 25 14:38:47 2014	(r341040)
@@ -6,17 +6,15 @@ PORTVERSION=	1.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 DISTNAME=	fnteditfs-${PORTVERSION}
-EXTRACT_SUFX=.tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	uri at keves.org
 COMMENT=	Full screen syscons font editor
 
-MAN1=		fnteditfs.1
-PLIST_FILES=	bin/fnteditfs
+PLIST_FILES=	bin/fnteditfs man/man1/fnteditfs.1.gz
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|__PREFIX__|${PREFIX}|g ; \
+	@${REINPLACE_CMD} -e 's|__PREFIX__|${STAGEDIR}${PREFIX}|g ; \
 		s|__INSTALL_MAN__|${INSTALL_MAN}|g ; \
 		s|__INSTALL_SCRIPT__|${INSTALL_SCRIPT}|g' ${WRKSRC}/Makefile
 

Modified: head/sysutils/fonteditfs/files/patch-Makefile
==============================================================================
--- head/sysutils/fonteditfs/files/patch-Makefile	Sat Jan 25 13:41:26 2014	(r341039)
+++ head/sysutils/fonteditfs/files/patch-Makefile	Sat Jan 25 14:38:47 2014	(r341040)
@@ -1,6 +1,6 @@
---- Makefile.orig	2003-09-20 12:17:34.000000000 -0300
-+++ Makefile	2009-08-29 14:56:21.000000000 -0300
-@@ -2,12 +2,7 @@
+--- Makefile.orig	2003-09-20 08:17:34.000000000 -0700
++++ Makefile	2014-01-01 12:27:59.000000000 -0800
+@@ -2,14 +2,9 @@
  # - TODO: MAKE NEATER ONE 
  # This makefile should work under most POSIX OSes (at least FreeBSD)
  
@@ -12,8 +12,11 @@
 -
 +all: fnteditfs
  fnteditfs: fnteditfs.o font.o stack.o
- 	gcc -o fnteditfs fnteditfs.o font.o stack.o -lcurses
+-	gcc -o fnteditfs fnteditfs.o font.o stack.o -lcurses
++	${CC} -o fnteditfs fnteditfs.o font.o stack.o -lcurses
  	strip fnteditfs
+ 
+ fnteditfs.o: fnteditfs.c font.h stack.h
 @@ -17,8 +12,8 @@
  stack.o: stack.c stack.h