parent
997321a2a9
commit
ddf5426d6e
|
@ -1,7 +1,6 @@
|
|||
COMMENT= simple irc client
|
||||
|
||||
DISTNAME= sic-1.2
|
||||
REVISION= 1
|
||||
DISTNAME= sic-1.3
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (sic-1.2.tar.gz) = rAf5BZleE7osQ5EtegNfu+eKYo17ocJW9MoTcvtWUYU=
|
||||
SIZE (sic-1.2.tar.gz) = 4563
|
||||
SHA256 (sic-1.3.tar.gz) = MEePqz68dfLrXQjLtbL+3K9IkRbnWi3XGX4+nHM9ZdI=
|
||||
SIZE (sic-1.3.tar.gz) = 5740
|
||||
|
|
|
@ -1,40 +1,33 @@
|
|||
--- Makefile.orig Sun Jun 16 08:03:32 2013
|
||||
+++ Makefile Fri Aug 23 08:31:32 2013
|
||||
@@ -14,14 +14,12 @@ options:
|
||||
@echo "CC = ${CC}"
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -4,8 +4,8 @@ NAME = sic
|
||||
VERSION = 1.3
|
||||
|
||||
.c.o:
|
||||
- @echo CC $<
|
||||
- @${CC} -c ${CFLAGS} $<
|
||||
+ ${CC} -c ${CFLAGS} $<
|
||||
# paths
|
||||
-PREFIX = /usr/local
|
||||
-MANPREFIX = ${PREFIX}/share/man
|
||||
+PREFIX ?= /usr/local
|
||||
+MANPREFIX = ${PREFIX}/man
|
||||
|
||||
${OBJ}: config.mk util.c
|
||||
|
||||
sic: ${OBJ}
|
||||
- @echo CC -o $@
|
||||
- @${CC} -o $@ ${OBJ} ${LDFLAGS}
|
||||
+ ${CC} -o $@ ${OBJ} ${LDFLAGS}
|
||||
|
||||
clean:
|
||||
@echo cleaning
|
||||
@@ -36,14 +34,12 @@ dist: clean
|
||||
@rm -rf sic-${VERSION}
|
||||
# use system flags.
|
||||
SIC_CFLAGS = ${CFLAGS}
|
||||
@@ -44,12 +44,12 @@ dist:
|
||||
rm -rf "${NAME}-${VERSION}"
|
||||
|
||||
install: all
|
||||
- @echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
||||
- @mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
- @cp -f sic ${DESTDIR}${PREFIX}/bin
|
||||
- @chmod 755 ${DESTDIR}${PREFIX}/bin/sic
|
||||
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
||||
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
- @sed "s/VERSION/${VERSION}/g" < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
|
||||
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/sic.1
|
||||
- mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
- cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
|
||||
- chmod 755 "${DESTDIR}${PREFIX}/bin/${BIN}"
|
||||
- mkdir -p "${DESTDIR}${MANPREFIX}/man1"
|
||||
- sed "s/VERSION/${VERSION}/g" < ${MAN1} > "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
|
||||
- chmod 644 "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
|
||||
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_PROGRAM} sic ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_PROGRAM} ${BIN} ${DESTDIR}${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
|
||||
+ sed "s/VERSION/${VERSION}/g" < sic.1 > sic.1.tmp
|
||||
+ mv sic.1.tmp sic.1
|
||||
+ ${BSD_INSTALL_MAN} sic.1 ${DESTDIR}${MANPREFIX}/man1
|
||||
+ sed "s/VERSION/${VERSION}/g" < ${MAN1} > ${MAN1}.tmp
|
||||
+ mv ${MAN1}.tmp ${MAN1}
|
||||
+ ${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man1
|
||||
|
||||
uninstall:
|
||||
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
||||
rm -f \
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
--- config.mk.orig Sun Jun 16 08:03:32 2013
|
||||
+++ config.mk Fri Aug 23 08:30:57 2013
|
||||
@@ -4,17 +4,17 @@ VERSION = 1.2
|
||||
# Customize below to fit your system
|
||||
|
||||
# paths
|
||||
-PREFIX = /usr/local
|
||||
-MANPREFIX = ${PREFIX}/share/man
|
||||
+PREFIX ?= /usr/local
|
||||
+MANPREFIX = ${PREFIX}/man
|
||||
|
||||
# includes and libs
|
||||
-INCS = -I. -I/usr/include
|
||||
-LIBS = -L/usr/lib -lc
|
||||
+INCS = -I${PREFIX}/include
|
||||
+LIBS = -L${PREFIX}/lib
|
||||
|
||||
# flags
|
||||
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
||||
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||
-LDFLAGS = -s ${LIBS}
|
||||
+CPPFLAGS += -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
||||
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
|
||||
+LDFLAGS += ${LIBS}
|
||||
|
||||
# compiler and linker
|
||||
-CC = cc
|
||||
+CC ?= cc
|
|
@ -1,6 +1,7 @@
|
|||
--- sic.c.orig Sun Jun 16 08:03:32 2013
|
||||
+++ sic.c Sat Sep 10 12:08:39 2016
|
||||
@@ -5,6 +5,7 @@
|
||||
Index: sic.c
|
||||
--- sic.c.orig
|
||||
+++ sic.c
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -8,12 +9,3 @@
|
|||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -173,6 +174,8 @@ main(int argc, char *argv[]) {
|
||||
fflush(srv);
|
||||
setbuf(stdout, NULL);
|
||||
setbuf(srv, NULL);
|
||||
+ if (pledge("stdio", NULL) == -1)
|
||||
+ eprint("error: pledge:");
|
||||
for(;;) { /* main loop */
|
||||
FD_ZERO(&rd);
|
||||
FD_SET(0, &rd);
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- util.c.orig Thu Oct 17 17:22:17 2013
|
||||
+++ util.c Thu Oct 17 17:22:46 2013
|
||||
@@ -49,7 +49,7 @@ strlcpy(char *to, const char *from, int l) {
|
||||
|
||||
static char *
|
||||
eat(char *s, int (*p)(int), int r) {
|
||||
- while(s != '\0' && p(*s) == r)
|
||||
+ while(*s != '\0' && p(*s) == r)
|
||||
s++;
|
||||
return s;
|
||||
}
|
Loading…
Reference in New Issue