diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-01-21 02:28:44 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-01-21 02:28:44 +0000 |
commit | 23a2af2c074bcda6d0e2939ca5cc94ed91e62f54 (patch) | |
tree | cd6d3dbe24337319684f673c42dde994eaad9866 /net-p2p/dctc | |
parent | Update qmail-mysql to patch level 1.1.8 (diff) |
Update to 0.67.0
Notes
Notes:
svn path=/head/; revision=53428
Diffstat (limited to 'net-p2p/dctc')
-rw-r--r-- | net-p2p/dctc/Makefile | 53 | ||||
-rw-r--r-- | net-p2p/dctc/distinfo | 2 | ||||
-rw-r--r-- | net-p2p/dctc/files/config.h | 30 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-Documentation:programs | 10 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:Makefile | 20 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:db.c | 11 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:dc_com.c | 11 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:dc_com.h | 11 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:dc_manage.c | 11 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:keyboard.c | 20 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:main.c | 17 | ||||
-rw-r--r-- | net-p2p/dctc/files/patch-src:sema.c | 21 | ||||
-rw-r--r-- | net-p2p/dctc/pkg-plist | 15 |
13 files changed, 46 insertions, 186 deletions
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile index 2f53d1de15db..eb2013c13bb7 100644 --- a/net-p2p/dctc/Makefile +++ b/net-p2p/dctc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dctc -PORTVERSION= 0.61 +PORTVERSION= 0.67.0 CATEGORIES= net MASTER_SITES= http://ac2i.tzo.com/dctc/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -17,35 +17,50 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt USE_GLIB= yes -NO_WRKSUBDIR= yes -BUILD_WRKSRC= ${WRKSRC}/src -MAKE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} -ALL_TARGET= - +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" +DOC_DIRS= Documentation Documentation/DCextensions DOC_FILES= COPYING ChangeLog INSTALL README \ - Documentation/DCextension Documentation/commands \ + KNOWN_BUGS TODO \ + Documentation/DCextensions/p2p_capabilities \ + Documentation/DCextensions/search_by_content \ + Documentation/GDL Documentation/VAR \ + Documentation/commands \ Documentation/output Documentation/programs -PROGRAM_FILES= dc_hublist dctc post-patch: - @${PERL} -pi -e 's/(CK?\(std)(out\))/\1_\2/' ${BUILD_WRKSRC}/* +.for file in ${DOC_FILES} + @${PERL} -pi -e 's|(hublist)|dc_\1|' ${WRKSRC}/${file} +.endfor + @${PERL} -pi -e 's/(CK?\(std)(out\))/\1_\2/' ${WRKSRC}/src/* + @${PERL} -pi -e 's/(CK?\()inet_ntoa(\))/\1shared_info\2/' ${WRKSRC}/src/* + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${PERL} -pi -e \ + 's|include.+<linux/sem.h>|include <sys/ipc.h>\n#include <sys/sem.h>|' + @${PERL} -pi -e 's|-lpthread|${PTHREAD_CFLAGS} ${PTHREAD_LIBS}|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -do-configure: - @${CP} ${FILESDIR}/config.h ${BUILD_WRKSRC} - @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} depend +post-configure: + @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h do-install: -.for file in ${PROGRAM_FILES} - @${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${file} ${PREFIX}/bin -.endfor .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR} +.for dir in ${DOC_DIRS} + @${MKDIR} ${DOCSDIR}/${dir} +.endfor .for file in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file} .endfor .endif + @${INSTALL_PROGRAM} ${WRKSRC}/src/hublist ${PREFIX}/bin/dc_hublist + @${INSTALL_PROGRAM} ${WRKSRC}/src/dctc ${PREFIX}/bin .include <bsd.port.mk> diff --git a/net-p2p/dctc/distinfo b/net-p2p/dctc/distinfo index b5286aaf174c..b3cabd487725 100644 --- a/net-p2p/dctc/distinfo +++ b/net-p2p/dctc/distinfo @@ -1 +1 @@ -MD5 (dctc-0.61.tar.gz) = 88606bb7a92e4b84af20fe6e92cfe1d2 +MD5 (dctc-0.67.0.tar.gz) = c4b5191bcee648ba83b0ef1ba8caa675 diff --git a/net-p2p/dctc/files/config.h b/net-p2p/dctc/files/config.h deleted file mode 100644 index c82313ca54e0..000000000000 --- a/net-p2p/dctc/files/config.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef ___CONFIG_H___ -#define ___CONFIG_H___ - -/* To enable detecting of BSD systems */ -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include <sys/param.h> -#endif - -#include <sys/types.h> -#include <sys/socket.h> - -/* For BSD */ -#if (defined(BSD) && (BSD >= 199103)) -# include <sys/ipc.h> -# include <sys/sem.h> -#else -/* For linux */ -# include <linux/sem.h> /* for the value of SEMVMX */ -#endif - -#ifndef MSG_NOSIGNAL -#define MSG_NOSIGNAL 0 -#endif - -#ifndef SEMVMX -/* this value comes from linux/sem.h */ -#define SEMVMX 32767 -#endif - -#endif /* ___CONFIG_H___ */ diff --git a/net-p2p/dctc/files/patch-Documentation:programs b/net-p2p/dctc/files/patch-Documentation:programs deleted file mode 100644 index ed4d67fab0b0..000000000000 --- a/net-p2p/dctc/files/patch-Documentation:programs +++ /dev/null @@ -1,10 +0,0 @@ ---- Documentation/programs.orig Thu Nov 22 02:18:27 2001 -+++ Documentation/programs Thu Nov 22 02:18:39 2001 -@@ -1,6 +1,6 @@ - 2 programs are builded by the makefile: - --- hublist -+- dc_hublist - - It retrieves the list of active hub from www.neo-modus.com. - Output is like this (one hub per line): diff --git a/net-p2p/dctc/files/patch-src:Makefile b/net-p2p/dctc/files/patch-src:Makefile deleted file mode 100644 index 74dc0f2fff3e..000000000000 --- a/net-p2p/dctc/files/patch-src:Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Makefile Sun Nov 25 07:37:30 2001 -+++ src/Makefile Sun Dec 2 19:34:46 2001 -@@ -1,6 +1,6 @@ - #CC = gcc --CFLAGS =-g -march=i586 -O2 -Wall `glib-config --cflags glib gthread` -Wpointer-arith -Wcast-qual -Wwrite-strings #-Wshadow --LDFLAGS = -g `glib-config --libs glib gthread` -+CFLAGS += -g -Wall `${GLIB_CONFIG} --cflags glib gthread` -Wpointer-arith -Wcast-qual -Wwrite-strings -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -+LDFLAGS += -g `${GLIB_CONFIG} --libs glib gthread` ${PTHREAD_LIBS} - - CSRC = main.c action.c dc_com.c display.c key.c keyboard.c network.c typical_action.c dc_manage.c db.c he3.c gts.c user_manage.c md.c timed_out_string.c sema.c - -@@ -15,7 +15,7 @@ - $(CC) $(CFLAGS) $(LDFLAGS) $(COBJ) -o dctc - - hublist: $(COBJ1) -- $(CC) $(CFLAGS) $(LDFLAGS) $(COBJ1) -o hublist -+ $(CC) $(CFLAGS) $(LDFLAGS) $(COBJ1) -o dc_hublist - - depend: - makedepend -- $(CFLAGS) -- $(CSRC) $(CSRC1) diff --git a/net-p2p/dctc/files/patch-src:db.c b/net-p2p/dctc/files/patch-src:db.c deleted file mode 100644 index e2d61a5d4ddb..000000000000 --- a/net-p2p/dctc/files/patch-src:db.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/db.c Mon Nov 26 16:28:32 2001 -+++ src/db.c Sun Dec 2 19:34:12 2001 -@@ -30,6 +30,8 @@ - #include <netinet/in.h> - #include <glib.h> - -+#include "config.h" -+ - #include "db.h" - #include "display.h" - #include "var.h" diff --git a/net-p2p/dctc/files/patch-src:dc_com.c b/net-p2p/dctc/files/patch-src:dc_com.c deleted file mode 100644 index 1472eac54753..000000000000 --- a/net-p2p/dctc/files/patch-src:dc_com.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dc_com.c Sat Oct 20 03:46:54 2001 -+++ src/dc_com.c Sun Dec 2 19:34:12 2001 -@@ -28,6 +28,8 @@ - #include <errno.h> - #include <glib.h> - -+#include "config.h" -+ - #include "dc_com.h" - #include "display.h" - #include "main.h" diff --git a/net-p2p/dctc/files/patch-src:dc_com.h b/net-p2p/dctc/files/patch-src:dc_com.h deleted file mode 100644 index 60e79d6b7191..000000000000 --- a/net-p2p/dctc/files/patch-src:dc_com.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dc_com.h Sat Oct 20 03:32:19 2001 -+++ src/dc_com.h Sun Dec 2 19:34:12 2001 -@@ -21,6 +21,8 @@ - #ifndef __DC_COM_H__ - #define __DC_COM_H__ - -+#include <time.h> -+ - extern char last_cmd[5120]; /* contains the first string of the last send_dc_line call */ - /* mainly used for debug features. */ - diff --git a/net-p2p/dctc/files/patch-src:dc_manage.c b/net-p2p/dctc/files/patch-src:dc_manage.c deleted file mode 100644 index 2106823aa755..000000000000 --- a/net-p2p/dctc/files/patch-src:dc_manage.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dc_manage.c Sat Dec 1 08:45:25 2001 -+++ src/dc_manage.c Sun Dec 2 19:34:12 2001 -@@ -35,6 +35,8 @@ - #include <fcntl.h> - #include <pthread.h> - -+#include "config.h" -+ - #include "display.h" - #include "action.h" - #include "macro.h" diff --git a/net-p2p/dctc/files/patch-src:keyboard.c b/net-p2p/dctc/files/patch-src:keyboard.c deleted file mode 100644 index df13bac0c7e3..000000000000 --- a/net-p2p/dctc/files/patch-src:keyboard.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/keyboard.c Sat Dec 1 08:53:15 2001 -+++ src/keyboard.c Sun Dec 2 19:34:12 2001 -@@ -31,6 +31,9 @@ - #include <netdb.h> - #include <glib.h> - -+#include "config.h" -+ -+#if !(defined(BSD) && (BSD >= 199103)) - #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) - /* union semun is defined by including <sys/sem.h> */ - #else -@@ -42,6 +45,7 @@ - struct seminfo *__buf; /* buffer for IPC_INFO */ - }; - #endif -+#endif - - #include "dc_com.h" - #include "display.h" diff --git a/net-p2p/dctc/files/patch-src:main.c b/net-p2p/dctc/files/patch-src:main.c deleted file mode 100644 index 4d5522f0b652..000000000000 --- a/net-p2p/dctc/files/patch-src:main.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/main.c Sat Dec 1 09:05:19 2001 -+++ src/main.c Sun Dec 2 19:34:12 2001 -@@ -30,12 +30,13 @@ - #include <sys/param.h> - #include <sys/utsname.h> - #include <sys/un.h> --#include <linux/sem.h> /* for the value of SEMVMX */ - #include <errno.h> - #include <getopt.h> - #include <string.h> - #include <glib.h> - #include <pthread.h> -+ -+#include "config.h" - - #include "var.h" - #include "display.h" diff --git a/net-p2p/dctc/files/patch-src:sema.c b/net-p2p/dctc/files/patch-src:sema.c deleted file mode 100644 index 9eba7f078b89..000000000000 --- a/net-p2p/dctc/files/patch-src:sema.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/sema.c Sat Nov 24 08:29:56 2001 -+++ src/sema.c Sun Dec 2 19:34:12 2001 -@@ -29,8 +29,10 @@ - #include <limits.h> - #include <pthread.h> - -+#include "config.h" - #include "sema.h" - -+#if !(defined(BSD) && (BSD >= 199103)) - #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) - /* union semun is defined by including <sys/sem.h> */ - #else -@@ -42,6 +44,7 @@ - struct seminfo *__buf; /* buffer for IPC_INFO */ - }; - #endif -+#endif - - #ifndef IPC_ALLOC - #define IPC_ALLOC 0 diff --git a/net-p2p/dctc/pkg-plist b/net-p2p/dctc/pkg-plist index 4a6d1f56d046..49ed6fd7b6fd 100644 --- a/net-p2p/dctc/pkg-plist +++ b/net-p2p/dctc/pkg-plist @@ -2,10 +2,17 @@ bin/dc_hublist bin/dctc %%PORTDOCS%%share/doc/dctc/COPYING %%PORTDOCS%%share/doc/dctc/ChangeLog -%%PORTDOCS%%share/doc/dctc/DCextension +%%PORTDOCS%%share/doc/dctc/Documentation/DCextensions/p2p_capabilities +%%PORTDOCS%%share/doc/dctc/Documentation/DCextensions/search_by_content +%%PORTDOCS%%share/doc/dctc/Documentation/GDL +%%PORTDOCS%%share/doc/dctc/Documentation/VAR +%%PORTDOCS%%share/doc/dctc/Documentation/commands +%%PORTDOCS%%share/doc/dctc/Documentation/output +%%PORTDOCS%%share/doc/dctc/Documentation/programs %%PORTDOCS%%share/doc/dctc/INSTALL +%%PORTDOCS%%share/doc/dctc/KNOWN_BUGS %%PORTDOCS%%share/doc/dctc/README -%%PORTDOCS%%share/doc/dctc/commands -%%PORTDOCS%%share/doc/dctc/output -%%PORTDOCS%%share/doc/dctc/programs +%%PORTDOCS%%share/doc/dctc/TODO +%%PORTDOCS%%@dirrm share/doc/dctc/Documentation/DCextensions +%%PORTDOCS%%@dirrm share/doc/dctc/Documentation %%PORTDOCS%%@dirrm share/doc/dctc |