Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Jan 2016 12:18:31 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407618 - in head/editors/uzap: . files
Message-ID:  <201601311218.u0VCIVZ2040218@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sun Jan 31 12:18:31 2016
New Revision: 407618
URL: https://svnweb.freebsd.org/changeset/ports/407618

Log:
  editors/uzap: document ncurses reqmt (USES+=ncurses), respect LDFLAGS
  
  while here, regenerate remaining patch and rename both of them.
  
  approved by:	infrastructure blanket

Added:
  head/editors/uzap/files/patch-Makefile   (contents, props changed)
  head/editors/uzap/files/patch-search.c   (contents, props changed)
Deleted:
  head/editors/uzap/files/patch-a
  head/editors/uzap/files/patch-b
Modified:
  head/editors/uzap/Makefile

Modified: head/editors/uzap/Makefile
==============================================================================
--- head/editors/uzap/Makefile	Sun Jan 31 12:11:03 2016	(r407617)
+++ head/editors/uzap/Makefile	Sun Jan 31 12:18:31 2016	(r407618)
@@ -10,6 +10,8 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Visual binary file editor
 
+USES=		ncurses
+
 # Has been posted to alt.sources in 1989
 # http://www.megalextoria.com/usenet-archive/news097f1/b120/alt/sources/00000521.html
 NO_CDROM=	This software may not be used to make a profit in any way.

Added: head/editors/uzap/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/uzap/files/patch-Makefile	Sun Jan 31 12:18:31 2016	(r407618)
@@ -0,0 +1,42 @@
+--- Makefile.orig	1989-03-30 18:04:11 UTC
++++ Makefile
+@@ -1,26 +1,28 @@
+ # Makefile for Uzap.
+-BINDIR = /usr/local
+-MANDIR = /usr/man/manl
+-MSECT = l
++BINDIR = ${PREFIX}/bin/
++MANDIR = ${PREFIX}/man/man1
++MSECT = 1
++
++all: uzap
+ 
+ uzap: uzap.o edit.o search.o screen.o
+-	cc -O uzap.o edit.o search.o screen.o -lcurses -ltermcap -o uzap
++	$(CC) $(CFLAGS) uzap.o edit.o search.o screen.o $(LDFLAGS) -lncurses -o uzap
+ 
+ uzap.o: uzap.c 
+-	cc -c -O uzap.c  
++	$(CC) -c $(CFLAGS) uzap.c  
+ 
+ edit.o: edit.c
+-	cc -c -O edit.c 
++	$(CC) -c $(CFLAGS) edit.c 
+ 
+ search.o: search.c
+-	cc -c -O search.c
++	$(CC) -c $(CFLAGS) search.c
+ 
+ screen.o: screen.c
+-	cc -c -O screen.c
++	$(CC) -c $(CFLAGS) screen.c
+ 
+ install: uzap
+-	install -s -m 771 uzap $(BINDIR)
+-	install -c -m 664 uzap.man $(MANDIR)/uzap.$(MSECT)
++	$(BSD_INSTALL_PROGRAM) uzap $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_MAN) uzap.man $(DESTDIR)$(MANDIR)/uzap.$(MSECT)
+ 
+ clean:
+-	rm -f *.o core uzap
++	rm -f *.o core *.core uzap

Added: head/editors/uzap/files/patch-search.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/uzap/files/patch-search.c	Sun Jan 31 12:18:31 2016	(r407618)
@@ -0,0 +1,11 @@
+--- search.c.orig	1989-03-30 18:04:12 UTC
++++ search.c
+@@ -217,7 +217,7 @@ unsigned char hdigit[16], temp[128];
+          }
+       }
+       for(x= 0; x < len - 1; x+= 2){
+-         strcpy(hdigit, hex + (len - x - 2), 2);
++         strncpy(hdigit, hex + (len - x - 2), 2);
+          hdigit[2]= '\0';
+    
+          if(hdigit[0] < 96) hdigit[0]= hdigit[0] - 48;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601311218.u0VCIVZ2040218>