diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-06-05 23:40:15 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-06-05 23:40:15 +0000 |
commit | 42df5aefce691ec74c6172f3e3a83b899f28c271 (patch) | |
tree | 38bf1f3a05063b58f1390c5c800779c9be4cfb61 | |
parent | - Update to 1.00 (diff) |
- Update to 1.4.1
PR: 124314
Submitted by: Ports Fury
-rw-r--r-- | irc/srvx/Makefile | 83 | ||||
-rw-r--r-- | irc/srvx/distinfo | 6 | ||||
-rw-r--r-- | irc/srvx/files/patch-aa | 25 | ||||
-rw-r--r-- | irc/srvx/files/patch-ab | 11 | ||||
-rw-r--r-- | irc/srvx/files/patch-src-Makefile.in | 20 | ||||
-rw-r--r-- | irc/srvx/files/patch-src-proto-p10.c | 16 | ||||
-rw-r--r-- | irc/srvx/files/pkg-message.in | 5 |
7 files changed, 53 insertions, 113 deletions
diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile index 47f55429e5a4..54741e2ac579 100644 --- a/irc/srvx/Makefile +++ b/irc/srvx/Makefile @@ -6,16 +6,37 @@ # PORTNAME= srvx -PORTVERSION= 1.3 +PORTVERSION= 1.3.1 CATEGORIES= irc net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= srvx +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= Srvx IRC services +COMMENT= A set of services for ircu P10 protocol networks + +OPTIONS= PROTOCOL_BAHAMUT "Enables Bahamut protocol (P10 is default)" "on" \ + DEBUG "Enables debug mode" "off" + +USE_GNOME= gnometarget +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-getopt + +SUB_FILES= pkg-message + +PORTDOCS= chanserv.help \ + global.help \ + mod-helpserv.help \ + mod-memoserv.help \ + mod-sockcheck.help \ + modcmd.help \ + nickserv.help \ + opserv.help \ + saxdb.help \ + sendmail.help +PLIST_FILES= bin/srvx \ + etc/srvx.conf.example \ + etc/sockcheck.conf.example -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +.include <bsd.port.pre.mk> .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug @@ -25,47 +46,17 @@ CONFIGURE_ARGS+= --enable-debug CONFIGURE_ARGS+= --with-protocol=bahamut .endif -PLIST_FILES= bin/srvx \ - etc/srvx.conf.example \ - etc/sockcheck.conf.example \ - share/doc/${PORTNAME}/chanserv.help \ - share/doc/${PORTNAME}/global.help \ - share/doc/${PORTNAME}/mod-helpserv.help \ - share/doc/${PORTNAME}/mod-memoserv.help \ - share/doc/${PORTNAME}/mod-sockcheck.help \ - share/doc/${PORTNAME}/modcmd.help \ - share/doc/${PORTNAME}/nickserv.help \ - share/doc/${PORTNAME}/opserv.help \ - share/doc/${PORTNAME}/saxdb.help \ - share/doc/${PORTNAME}/sendmail.help -PLIST_DIRS= share/doc/${PORTNAME} - -pre-fetch: - @ ${ECHO} "" - @ ${ECHO} "--------------------------------------------------------------------------------" - @ ${ECHO} "" - @ ${ECHO} "The following build options are availabe:" - @ ${ECHO} "" - @ ${ECHO} " WITH_PROTOCOL_BAHAMUT=yes Enables Bahamut protocol" - @ ${ECHO} " (P10 is default)." - @ ${ECHO} "" - @ ${ECHO} " WITH_DEBUG=yes Enables debug mode." - @ ${ECHO} "" - @ ${ECHO} "--------------------------------------------------------------------------------" - @ ${ECHO} "" - -post-install: - @ ${ECHO} "" - @ ${ECHO} " When you 'make deinstall', any files generated by ${PORTNAME} (logs, etc)" - @ ${ECHO} " will remain in ${PREFIX}/etc/. These files must be removed manually." - @ ${ECHO} "" - @ ${ECHO} " ${PORTNAME} .help files are located in ${DOCSDIR}." - @ ${ECHO} "" - -.include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} -e 's|= "srvx.conf"|= "${PREFIX}/etc/srx.conf"|g' \ + ${WRKSRC}/src/main.c -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/srvx ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/*.conf.example ${PREFIX}/etc +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/src/*.help ${DOCSDIR} .endif + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/irc/srvx/distinfo b/irc/srvx/distinfo index a17ef2880e88..2eeaca066a69 100644 --- a/irc/srvx/distinfo +++ b/irc/srvx/distinfo @@ -1,3 +1,3 @@ -MD5 (srvx-1.3.tar.gz) = 856d4d452d32340224400dfdfeaf70bc -SHA256 (srvx-1.3.tar.gz) = e4db290e21f68487960edca1c64047e8240454a716589ac69a01a379b0d927e7 -SIZE (srvx-1.3.tar.gz) = 572481 +MD5 (srvx-1.3.1.tar.gz) = 6539f342b7c12a719b390e6cd36a14dd +SHA256 (srvx-1.3.1.tar.gz) = 4eb7805685c0a1fb3f0c3d30658e6fa031b3a2103a74a2070e0f9170e7ec95a4 +SIZE (srvx-1.3.1.tar.gz) = 756377 diff --git a/irc/srvx/files/patch-aa b/irc/srvx/files/patch-aa deleted file mode 100644 index b1c049dc0b7b..000000000000 --- a/irc/srvx/files/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.in Sun Oct 12 22:37:15 2003 -+++ Makefile.in Sun Nov 30 04:31:56 2003 -@@ -519,12 +519,17 @@ - - install-exec-local: - $(INSTALL) -d -m 755 $(prefix) -- $(INSTALL) -m 744 ./src/srvx $(prefix) -- $(INSTALL) -m 644 $(srcdir)/src/*.help $(prefix) -- $(INSTALL) -m 600 $(srcdir)/srvx.conf.example $(prefix) -- $(INSTALL) -m 644 $(srcdir)/sockcheck.conf.example $(prefix) -+ $(INSTALL) -d -m 755 $(prefix)/etc -+ $(INSTALL) -d -m 755 $(prefix)/share -+ $(INSTALL) -d -m 755 $(prefix)/share/doc -+ $(INSTALL) -d -m 755 $(prefix)/share/doc/srvx -+ $(INSTALL) -d -m 755 $(prefix)/bin -+ $(INSTALL) -m 744 ./src/srvx $(prefix)/bin/srvx -+ $(INSTALL) -m 644 $(srcdir)/src/*.help $(prefix)/share/doc/srvx/ -+ $(INSTALL) -m 600 $(srcdir)/srvx.conf.example $(prefix)/etc/ -+ $(INSTALL) -m 644 $(srcdir)/sockcheck.conf.example $(prefix)/etc/ - @echo -- @echo srvx-$(VERSION) has been installed to $(prefix) -+ @echo srvx-$(VERSION) has been installed to $(prefix)/bin - @echo Remember to edit srvx.conf.example and sockcheck.conf.example - @echo And of course, ./srvx --help before starting. - @echo diff --git a/irc/srvx/files/patch-ab b/irc/srvx/files/patch-ab deleted file mode 100644 index 4a52ec7280f6..000000000000 --- a/irc/srvx/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main.c Mon Sep 1 10:50:28 2003 -+++ src/main.c Sun Nov 30 03:17:29 2003 -@@ -65,7 +65,7 @@ - - int quit_services, max_cycles; - --char *services_config = "srvx.conf"; -+char *services_config = "../etc/srvx.conf"; - - char **services_argv; - int services_argc; diff --git a/irc/srvx/files/patch-src-Makefile.in b/irc/srvx/files/patch-src-Makefile.in deleted file mode 100644 index 89d4d0e03468..000000000000 --- a/irc/srvx/files/patch-src-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Makefile.am.old Mon Mar 14 23:35:03 2005 -+++ src/Makefile.am Mon Mar 14 23:35:13 2005 -@@ -11,7 +11,6 @@ - .PHONY: checkversion - arch-version.h: checkversion - checkversion: -- @tla logs -f >/dev/null || exit 0; \ - TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \ - echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \ - if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \ ---- src/Makefile.in.old Mon Mar 14 23:35:17 2005 -+++ src/Makefile.in Mon Mar 14 23:35:33 2005 -@@ -527,7 +527,6 @@ - .PHONY: checkversion - arch-version.h: checkversion - checkversion: -- @tla logs -f >/dev/null || exit 0; \ - TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \ - echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \ - if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \ diff --git a/irc/srvx/files/patch-src-proto-p10.c b/irc/srvx/files/patch-src-proto-p10.c index b091a3cae966..0f27155aba3b 100644 --- a/irc/srvx/files/patch-src-proto-p10.c +++ b/irc/srvx/files/patch-src-proto-p10.c @@ -1,19 +1,19 @@ ---- src/proto-p10.c.old Tue Feb 22 05:11:21 2005 -+++ src/proto-p10.c Mon Mar 14 22:21:12 2005 -@@ -367,10 +367,10 @@ +--- src/proto-p10.c.orig 2008-05-29 03:46:01.000000000 +0900 ++++ src/proto-p10.c 2008-05-29 03:48:41.000000000 +0900 +@@ -369,10 +369,10 @@ if (srv == self) { /* The +s, ignored by Run's ircu, means "service" to Undernet's ircu */ - putsock(P10_SERVER " %s %d %li %li J10 %s%s +s :%s", + putsock(P10_SERVER " %s %d %li %li J10 %s%s +s6 :%s", - srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description); + srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, srv->numeric, extranum, srv->description); } else { - putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s :%s", + putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s6 :%s", - self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); + self->numeric, srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description); } } -@@ -408,10 +408,10 @@ +@@ -485,10 +485,10 @@ /* we don't need to put the + in modes because it's in the format string. */ putsock("%s " P10_NICK " %s %d %li %s %s +%s %s %s :%s", @@ -26,7 +26,7 @@ } } -@@ -545,7 +545,7 @@ +@@ -637,7 +637,7 @@ irc_gline(struct server *srv, struct gline *gline) { putsock("%s " P10_GLINE " %s +%s %ld :%s", @@ -35,7 +35,7 @@ } void -@@ -680,9 +680,9 @@ +@@ -772,9 +772,9 @@ { if (what->members.used == 1) { putsock("%s " P10_CREATE " %s %lu", diff --git a/irc/srvx/files/pkg-message.in b/irc/srvx/files/pkg-message.in new file mode 100644 index 000000000000..40c4b21c687a --- /dev/null +++ b/irc/srvx/files/pkg-message.in @@ -0,0 +1,5 @@ +------------------------------------------------------------------ +When you 'make deinstall', any files generated by srvx (logs, etc) +will remain in %%PREFIX%%/etc/. These files must be removed +manually. +------------------------------------------------------------------ |