mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Convert to staging

Browse Source 
- 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
This commit is contained in:
Mathieu Arnold 2014-03-20 00:09:25 +00:00
parent fcefee7805
commit f7f3bd73b8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=348657
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/display/Makefile
View File

@ -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>

0
misc/display/files/patch-ab → misc/display/files/patch-Makefile.in
View File

25
misc/display/files/patch-aa → misc/display/files/patch-display.c
View File

@ -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;