Index: russian/ircd-hybrid/Makefile =================================================================== --- russian/ircd-hybrid/Makefile +++ russian/ircd-hybrid/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= ircd-[0-9]* +CONFLICTS= ircd-[0-9]* irc-[0-9]* charybdis-[0-9]* Nefarious-[0-9]* ircd-hybrid-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-ru USE_OPENSSL= yes @@ -26,8 +26,7 @@ USERS= ircdru GROUPS= ircdru - -MAN8= ircd.8 +PLIST_SUB= USR=$(USERS) GRP=$(GROUPS) .if defined(WITH_SMALL_NET) CONFIGURE_ARGS+=-enable-small-net @@ -49,7 +48,6 @@ CONFIGURE_ARGS+=--with-maxconn=${MAXCONN} .endif -NO_STAGE= yes pre-extract: @${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *" @${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network" @@ -72,13 +70,10 @@ @${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf post-install: - @${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d - @${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/etc/ircd-hybrid-ru - @${CHOWN} -R ${USERS}:${GROUPS} /var/log/ircd-hybrid-ru - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/RELNOTE* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/server-version-info ${DOCSDIR} - @${CAT} ${PKGMESSAGE} + @${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${STAGEDIR}${PREFIX}/etc/rc.d + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/RELNOTE* ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/server-version-info ${STAGEDIR}${DOCSDIR} .include Index: russian/ircd-hybrid/files/patch-etc-Makefile.in =================================================================== --- russian/ircd-hybrid/files/patch-etc-Makefile.in +++ russian/ircd-hybrid/files/patch-etc-Makefile.in @@ -1,6 +1,19 @@ ---- etc/Makefile.in.orig Thu May 5 16:21:59 2005 -+++ etc/Makefile.in Thu May 5 16:20:08 2005 -@@ -27,6 +27,8 @@ +--- etc/Makefile.in.orig 2007-01-08 12:23:12.000000000 +0000 ++++ etc/Makefile.in 2014-04-01 13:47:46.447714208 +0000 +@@ -9,10 +9,9 @@ + # no whitespace here, test will mess up + CLOBBER=@CLOBBER@ + +-prefix = $(DESTDIR)@prefix@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ + sysconfdir = $(DESTDIR)@sysconfdir@ +-codepagesdir = @sysconfdir@/codepages +-exec_prefix = $(DESTDIR)@exec_prefix@ + datarootdir = $(DESTDIR)@datarootdir@ + + DISTFILES = @EXAMPLE_CONF@ +@@ -30,6 +29,8 @@ echo $(INSTALL_DATA) $$i $(sysconfdir); \ $(INSTALL_DATA) $$i $(sysconfdir); \ done @@ -9,3 +22,18 @@ @echo "Note: more example configuration files can be found in this directory (etc/)." +@@ -52,13 +53,9 @@ + fi; \ + done + +- -@if test ! -d $(codepagesdir); then \ +- echo "mkdir $(codepagesdir)"; \ +- mkdir $(codepagesdir); \ +- fi + @for codepages in codepages/*; do \ + if [ -f $$codepages ]; then \ +- ${INSTALL_DATA} $$codepages $(codepagesdir); \ ++ ${INSTALL_DATA} $$codepages $(sysconfdir)/codepages ; \ + fi \ + done + Index: russian/ircd-hybrid/files/patch-help-Makefile.in =================================================================== --- /dev/null +++ russian/ircd-hybrid/files/patch-help-Makefile.in @@ -0,0 +1,43 @@ +--- help/Makefile.in.orig 2006-12-19 15:53:05.000000000 +0000 ++++ help/Makefile.in 2014-04-01 12:13:09.643103051 +0000 +@@ -8,8 +8,8 @@ + prefix = @prefix@ + exec_prefix = @execprefix@ + datarootdir = $(DESTDIR)@datarootdir@ +-uhelpdir = ${prefix}/help/users +-ohelpdir = ${prefix}/help/opers ++uhelpdir = $(DESTDIR)${prefix}/help/users ++ohelpdir = $(DESTDIR)${prefix}/help/opers + + SYMLINKS = topic accept cmode admin names links away whowas \ + version kick who invite quit join list nick oper part \ +@@ -22,13 +22,13 @@ + + install: + @echo installing help files... +- -@if test ! -d $(prefix)/help; then \ +- echo "mkdir $(prefix)/help"; \ +- mkdir $(prefix)/help; \ +- echo "mkdir $(prefix)/help/users"; \ +- mkdir $(prefix)/help/users; \ +- echo "mkdir $(prefix)/help/opers"; \ +- mkdir $(prefix)/help/opers; \ ++ @if test ! -d $(uhelpdir) ; then \ ++ echo "mkdir $(uhelpdir)"; \ ++ mkdir -p $(uhelpdir); \ ++ fi ++ @if test ! -d $(ohelpdir); then\ ++ echo "mkdir $(ohelpdir)"; \ ++ mkdir -p $(ohelpdir); \ + fi + @for help in opers/*; do \ + if [ -f $$help ]; then \ +@@ -42,7 +42,7 @@ + done + @for link in $(SYMLINKS); do \ + rm -f $(uhelpdir)/$$link; \ +- ln -s $(ohelpdir)/$$link $(uhelpdir); \ ++ ( cd $(uhelpdir) ; ln -s ../operator/$$link;); \ + done + + distclean: Index: russian/ircd-hybrid/files/patch-include-memory.h =================================================================== --- /dev/null +++ russian/ircd-hybrid/files/patch-include-memory.h @@ -0,0 +1,11 @@ +--- include/memory.h 2014-04-01 07:44:11.659215390 +0000 ++++ include/memory.h 2014-04-01 07:42:15.054225075 +0000 +@@ -49,7 +49,7 @@ + /* forte (and maybe others) don't like double declarations, + * so we don't declare the inlines unless GNUC + */ +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + extern inline void * + MyMalloc(size_t size) + { Index: russian/ircd-hybrid/files/patch-include-tools.h =================================================================== --- /dev/null +++ russian/ircd-hybrid/files/patch-include-tools.h @@ -0,0 +1,11 @@ +--- include/tools.h.orig 2014-04-01 07:57:16.040161762 +0000 ++++ include/tools.h 2014-04-01 07:58:16.339157016 +0000 +@@ -91,7 +91,7 @@ + /* forte (and maybe others) dont like these being declared twice, + * so we dont declare the inlines unless GNUC. + */ +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + + /* + * dlink_ routines are stolen from squid, except for dlinkAddBefore, Index: russian/ircd-hybrid/files/patch-modules-Makefile.in =================================================================== --- russian/ircd-hybrid/files/patch-modules-Makefile.in +++ russian/ircd-hybrid/files/patch-modules-Makefile.in @@ -1,15 +1,27 @@ ---- modules/Makefile.in.orig Tue Jun 20 16:59:06 2006 -+++ modules/Makefile.in Tue Oct 17 08:35:33 2006 -@@ -23,7 +23,7 @@ +--- modules/Makefile.in.orig 2007-01-08 12:23:12.000000000 +0000 ++++ modules/Makefile.in 2014-04-01 12:52:35.104952980 +0000 +@@ -14,6 +14,7 @@ + MKDEP = @MKDEP@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_BIN = @INSTALL_PROGRAM@ + MV = @MV@ + LD = @LD@ - prefix = $(DESTDIR)@prefix@ +@@ -21,10 +22,10 @@ + SSL_INCLUDES = @SSL_INCLUDES@ + IRCDLIBS = @LIBS@ $(SSL_LIBS) + +-prefix = $(DESTDIR)@prefix@ ++prefix = @prefix@ + datarootdir = $(DESTDIR)@datarootdir@ # Change this later! -- adrian -moduledir = ${prefix}/modules -+moduledir = ${prefix}/lib/ircd-hybrid-ru-modules ++moduledir = $(DESTDIR)${prefix}/lib/ircd-hybrid-ru-modules automoduledir = ${moduledir}/autoload INCLUDES = -I../include -I../lib/pcre $(SSL_INCLUDES) -@@ -111,7 +111,9 @@ +@@ -112,7 +113,9 @@ m_who.c \ m_whois.c \ m_whowas.c \ @@ -20,3 +32,29 @@ ALL_SRCS = $(CORE_SRCS) $(SRCS) @SSL_SRCS_ENABLE@ +@@ -158,21 +161,21 @@ + install_shared_modules: install-mkdirs + @echo "Installing core modules into $(moduledir) .." + @for file in $(SH_CORE_OBJS); do \ +- $(INSTALL_DATA) $$file $(moduledir); \ ++ $(INSTALL_BIN) $$file $(moduledir); \ + done + @echo "Installing modules into $(automoduledir) .." + @for file in $(SH_OBJS); do \ +- $(INSTALL_DATA) $$file $(automoduledir); \ ++ $(INSTALL_BIN) $$file $(automoduledir); \ + done + + install_hpux_shared: install-mkdirs + @echo "Installing core modules into $(moduledir) .." + @for file in $(HPUX_CORE_OBJS); do \ +- $(INSTALL_DATA) $$file $(moduledir); \ ++ $(INSTALL_BIN) $$file $(moduledir); \ + done + @echo "Installing modules into $(automoduledir) .." + @for file in $(HPUX_OBJS); do \ +- $(INSTALL_DATA) $$file $(automoduledir); \ ++ $(INSTALL_BIN) $$file $(automoduledir); \ + done + + .SUFFIXES: .sl .so .o Index: russian/ircd-hybrid/files/patch-servlink-Makefile.in =================================================================== --- /dev/null +++ russian/ircd-hybrid/files/patch-servlink-Makefile.in @@ -0,0 +1,11 @@ +--- servlink/Makefile.in.orig 2014-04-01 13:27:43.421795014 +0000 ++++ servlink/Makefile.in 2014-04-01 13:28:04.084793292 +0000 +@@ -15,7 +15,7 @@ + RM = @RM@ + SED = @SED@ + prefix = @prefix@ +-exec_prefix = $(DESTDIR)@exec_prefix@ ++exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + datarootdir = $(DESTDIR)@datarootdir@ + Index: russian/ircd-hybrid/files/patch-src-Makefile.in =================================================================== --- russian/ircd-hybrid/files/patch-src-Makefile.in +++ russian/ircd-hybrid/files/patch-src-Makefile.in @@ -1,11 +1,20 @@ ---- src/Makefile.in.ORIG Mon Oct 16 13:38:09 2006 -+++ src/Makefile.in Mon Oct 16 13:38:24 2006 -@@ -121,7 +121,7 @@ +--- src/Makefile.in.orig 2007-01-08 12:23:12.000000000 +0000 ++++ src/Makefile.in 2014-04-01 12:45:56.938967409 +0000 +@@ -18,7 +18,7 @@ + SED = @SED@ + + prefix = @prefix@ +-exec_prefix = $(DESTDIR)@exec_prefix@ ++exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + sysconfdir = $(DESTDIR)@sysconfdir@ + localstatedir = $(DESTDIR)@localstatedir@ +@@ -122,7 +122,7 @@ install-mkdirs: mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \ - $(localstatedir)/logs -+ /var/log/ircd-hybrid-ru ++ $(DESTDIR)/var/log/ircd-hybrid-ru install: install-mkdirs build @for i in $(PROGS); do \ Index: russian/ircd-hybrid/files/patch-tools-Makefile.in =================================================================== --- /dev/null +++ russian/ircd-hybrid/files/patch-tools-Makefile.in @@ -0,0 +1,13 @@ +--- tools/Makefile.in.orig 2006-12-19 15:53:05.000000000 +0000 ++++ tools/Makefile.in 2014-04-01 12:39:48.914994557 +0000 +@@ -18,8 +18,8 @@ + + INCLUDES = -I../include $(SSL_INCLUDES) + +-prefix = $(DESTDIR)@prefix@ +-exec_prefix = $(DESTDIR)@exec_prefix@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + datarootdir = $(DESTDIR)@datarootdir@ + Index: russian/ircd-hybrid/pkg-plist =================================================================== --- russian/ircd-hybrid/pkg-plist +++ russian/ircd-hybrid/pkg-plist @@ -16,7 +16,7 @@ etc/ircd-hybrid-ru/rkline.conf etc/ircd-hybrid-ru/rxline.conf etc/ircd-hybrid-ru/xline.conf -etc/rc.d/ircd-hybrid-ru.sh.sample +@sample etc/rc.d/ircd-hybrid-ru.sh.sample help/opers/accept help/opers/admin help/opers/away @@ -382,6 +382,7 @@ lib/ircd-hybrid-ru-modules/m_server.so lib/ircd-hybrid-ru-modules/m_sjoin.so lib/ircd-hybrid-ru-modules/m_squit.so +man/man8/ircd.8.gz %%DOCSDIR%%/CIDR.txt %%DOCSDIR%%/LazyLinks.txt %%DOCSDIR%%/RELNOTES @@ -398,15 +399,16 @@ %%DOCSDIR%%/serverhide.txt %%DOCSDIR%%/whats-new.txt @dirrm share/doc/ircd -@dirrm etc/ircd-hybrid-ru/codepages -@dirrm etc/ircd-hybrid-ru @dirrm lib/ircd-hybrid-ru-modules/autoload @dirrm lib/ircd-hybrid-ru-modules @dirrm help/users @dirrm help/opers @dirrm help -@exec mkdir -m 755 /var/log/ircd-hybrid-ru -@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru -@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true -@unexec rmdir %D/etc/ircd-hybrid-ru/codepages 2>/dev/null || true -@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true +@dirrm etc/ircd-hybrid-ru/codepages +@dirrm etc/ircd-hybrid-ru +@owner %%USR%% +@group %%GRP%% +@exec install -d -m 755 -o %%USR%% -g %%GRP%% /var/log/ircd-hybrid-ru +@dirrmtry /var/log/ircd-hybrid-ru +@owner root +@group wheel