Date: Thu, 20 Mar 2014 00:09:25 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348657 - in head/misc/display: . files Message-ID: <201403200009.s2K09PK1013816@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Mar 20 00:09:25 2014 New Revision: 348657 URL: http://svnweb.freebsd.org/changeset/ports/348657 QAT: https://qat.redports.org/buildarchive/r348657/ Log: - Convert to staging - Cleanup unneeded bits in the Makefile - Patch a bit more to fix compiler warnings - While there, rename patches to follow makepatch naming. Sponsored by: Absolight Added: head/misc/display/files/patch-Makefile.in - copied unchanged from r348656, head/misc/display/files/patch-ab head/misc/display/files/patch-display.c - copied, changed from r348656, head/misc/display/files/patch-aa Deleted: head/misc/display/files/patch-aa head/misc/display/files/patch-ab Modified: head/misc/display/Makefile Modified: head/misc/display/Makefile ============================================================================== --- head/misc/display/Makefile Wed Mar 19 23:17:00 2014 (r348656) +++ head/misc/display/Makefile Thu Mar 20 00:09:25 2014 (r348657) @@ -15,7 +15,6 @@ GNU_CONFIGURE= yes DISPLAY_PROGRAM_PREFIX?= .if empty(DISPLAY_PROGRAM_PREFIX) -NO_STAGE= yes pre-everything:: @${ECHO_MSG} "NOTE: You may set DISPLAY_PROGRAM_PREFIX to change the name of the 'display'" @${ECHO_MSG} "utility so that it does not conflict with similarly named files from" @@ -24,14 +23,10 @@ pre-everything:: CONFLICTS= ImageMagick-[0-9]* goblin-* .endif -CONFIGURE_ARGS+= --program-prefix=${DISPLAY_PROGRAM_PREFIX} -LDFLAGS+= ${STRIP} - -MAN1= ${DISPLAY_PROGRAM_PREFIX}display.1 -PLIST_FILES= bin/${DISPLAY_PROGRAM_PREFIX}display +PLIST_FILES= bin/${DISPLAY_PROGRAM_PREFIX}display man/man1/${DISPLAY_PROGRAM_PREFIX}display.1.gz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/display ${PREFIX}/bin/${DISPLAY_PROGRAM_PREFIX}display - ${INSTALL_MAN} ${WRKSRC}/display.man ${MANPREFIX}/man/man1/${DISPLAY_PROGRAM_PREFIX}display.1 + ${INSTALL_PROGRAM} ${WRKSRC}/display ${STAGEDIR}${PREFIX}/bin/${DISPLAY_PROGRAM_PREFIX}display + ${INSTALL_MAN} ${WRKSRC}/display.man ${STAGEDIR}${MANPREFIX}/man/man1/${DISPLAY_PROGRAM_PREFIX}display.1 .include <bsd.port.mk> Copied: head/misc/display/files/patch-Makefile.in (from r348656, head/misc/display/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/display/files/patch-Makefile.in Thu Mar 20 00:09:25 2014 (r348657, copy of r348656, head/misc/display/files/patch-ab) @@ -0,0 +1,30 @@ +--- Makefile.in.orig Wed Dec 14 05:50:47 2005 ++++ Makefile.in Thu Dec 15 14:49:37 2005 +@@ -2,10 +2,14 @@ + # vix 15dec86 [stolen from 'which'] + + # start changing +-CFLAGS = -O +-DEST_DIR = /usr/local/bin ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ ++CC = @CC@ ++DEST_DIR = @bindir@ + CURSES_LIBS = -lncurses +-MAN_DIR = /usr/local/man/man1 ++MAN_DIR = @mandir@/man1 + MAN_SUFFIX = 1 + SHAR_ARGS = -b -c -v + # stop changing +@@ -16,8 +20,7 @@ + all : display + + display : display.c +- cc $(CFLAGS) -o $@ display.c $(CURSES_LIBS) +- strip display ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ display.c $(CURSES_LIBS) + + install : all + mv display $(DEST_DIR) Copied and modified: head/misc/display/files/patch-display.c (from r348656, head/misc/display/files/patch-aa) ============================================================================== --- head/misc/display/files/patch-aa Wed Mar 19 23:17:00 2014 (r348656, copy source) +++ head/misc/display/files/patch-display.c Thu Mar 20 00:09:25 2014 (r348657) @@ -1,14 +1,17 @@ ---- display.c.orig Thu Dec 15 14:29:14 2005 -+++ display.c Thu Dec 15 14:29:58 2005 -@@ -12,6 +12,7 @@ +--- ./display.c.orig 2005-12-14 04:40:15.000000000 +0100 ++++ ./display.c 2014-03-20 01:01:07.000000000 +0100 +@@ -12,6 +12,10 @@ #include <signal.h> #include <ctype.h> #include <time.h> +#include <stdio.h> ++#include <unistd.h> ++#include <stdlib.h> ++#include <string.h> #define DEFAULT_DELAY 5 #define DISPLAY_VERSION "1.2" -@@ -19,6 +20,8 @@ +@@ -19,17 +23,16 @@ static char *Command; static int Delay; @@ -17,7 +20,9 @@ char lt[128]; int ntimes; -@@ -27,9 +30,6 @@ +-main(argc, argv) ++int main(argc, argv) + int argc; char *argv[]; { int i, c; @@ -27,7 +32,7 @@ for(i = 0; i < 128; i++) { -@@ -90,7 +90,7 @@ +@@ -90,7 +93,7 @@ void display() { @@ -36,3 +41,11 @@ int ch; char *dt; time_t tnow; +@@ -133,7 +136,6 @@ + int argc; + char *argv[]; + { +- extern void usage(); + auto int argn, + delay_found; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403200009.s2K09PK1013816>