3 files changed, 57 insertions, 45 deletions

diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index 8c92a240d54b..d9d7f1aad28a 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -3,27 +3,29 @@
 
 PORTNAME=	ircd-ru
 PORTVERSION=	1.0.7
-PORTREVISION=	6
-CATEGORIES=	irc russian
-MASTER_SITES=	http://link.wenet.su/
+PORTREVISION=	7
+CATEGORIES=	russian irc
+MASTER_SITES=	http://m1cro.tk/ports/distfiles/
 DISTNAME=	ircd-RU-${PORTVERSION}-03-rc-20090810
 
 MAINTAINER=	rum1cro@yandex.ru
-COMMENT=	An irc daemon with translation schemes and other useful features
+COMMENT=	IRC daemon with translation schemes and other useful features
 
-USE_BZIP2=	yes
+LICENSE=	GPLv1
+
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
-SUB_FILES=	pkg-message
 USE_RC_SUBR=	ircd
 WRKSRC=		${WRKDIR}/ircd-RU-${PORTVERSION}-03-rc
 
 USERS=		ircd
 GROUPS=		${USERS}
 
-VARDIR=		/var
+VARDIR=	/var
 PLIST_SUB=	VARDIR=${VARDIR}
 
-OPTIONS_DEFINE=	WENET HUB ENCRYPTION SYSLOGFILE DRONEMODULE AUTHMODULE DNSBL SELECT DOCS
+OPTIONS_DEFINE=	WENET HUB ENCRYPTION SYSLOGFILE DRONEMODULE AUTHMODULE \
+				DNSBL SELECT DOCS
 WENET_DESC=		irc.wenet.ru specific options
 HUB_DESC=		hub support
 ENCRYPTION_DESC=	RC4 crypt (server to server connection)
@@ -33,7 +35,6 @@ AUTHMODULE_DESC=	authmodule support
 DNSBL_DESC=		DNSBL support
 SELECT_DESC=		enable select I/O
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # irc.wenet.ru specific options
@@ -49,7 +50,7 @@ CONFIGURE_ARGS+=--enable-hub
 # enable RC4 crypt (server to server connection)
 .if ${PORT_OPTIONS:MENCRYPTION}
 CONFIGURE_ARGS+=--enable-encryption
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 .endif
 
 # log to file instead of syslog
@@ -79,8 +80,16 @@ CONFIGURE_ARGS+=--enable-select
 
 post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -Ee '/(dir_HPATH)|opers.txt/d' ${WRKSRC}/tools/install_ircd.in
+	@${REINPLACE_CMD} -Ee '/(dir_HPATH)|opers.txt/d' \
+		${STAGEDIR}${WRKSRC}/tools/install_ircd.in
 .endif
+	#FIXME rene DESTDIR support is broken upstream
+	@${REINPLACE_CMD} -e 's|-d $$dir_LPATH|-d ${STAGEDIR}$$dir_LPATH|g' \
+		-e 's|-d $$dir_PPATH|-d ${STAGEDIR}$$dir_PPATH|g' \
+		-e 's|-d $$dir_EPATH|-d ${STAGEDIR}$$dir_EPATH|g' \
+		-e 's|-d $$dir_MCPATH|-d ${STAGEDIR}$$dir_MCPATH|g' \
+		-e 's|STAGE|${STAGEDIR}|g' \
+		${WRKSRC}/tools/install_ircd.in
 
 pre-build:
 	@${ECHO_MSG} ""
@@ -89,7 +98,7 @@ pre-build:
 	@${ECHO_MSG} ""
 
 post-install:
-	@${CHOWN} -R ircd:ircd ${VARDIR}/log/ircd-ru
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${VARDIR}/log/ircd-ru
+	@${MKDIR} ${STAGEDIR}${VARDIR}/run/ircd-ru
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-ru/files/patch-paths.h.in b/irc/ircd-ru/files/patch-paths.h.in
index 936fcf27c60b..55879164485d 100644
--- a/irc/ircd-ru/files/patch-paths.h.in
+++ b/irc/ircd-ru/files/patch-paths.h.in
@@ -1,8 +1,8 @@
 --- include/paths.h.in.orig	Sun Aug 10 21:29:06 2003
 +++ include/paths.h.in	Sun Aug 10 21:30:46 2003
 @@ -55,26 +55,26 @@
- 
- 
+
+
  #define DPATH		"@prefix@"
 -#define SPATH		"bin/ircd@BIN_SUF@"
 +#define SPATH		"sbin/ircd@BIN_SUF@"
@@ -11,7 +11,7 @@
 -#define MDIR		"modules"
 +#define CPDIR		"share/ircd-ru/codepages"
 +#define MDIR		"share/ircd-ru/modules"
- 
+
 -#define CPATH		"etc/ircd.conf"
 -#define KPATH   	"etc/kline.conf"
 -#define MPATH		"etc/ircd.motd"
@@ -26,19 +26,19 @@
 +#define LPATH		"/var/log/ircd-ru/ircd.log"
 +#define PPATH		"/var/run/ircd-ru/ircd.pid"
 +#define HPATH		"share/doc/ircd-ru/opers.txt"
- 
+
 -#define EPATH		".ircd.entropy"
 -#define MCPATH		".maxclients"
 +#define EPATH		"/var/run/ircd-ru/.ircd.entropy"
 +#define MCPATH		"/var/run/ircd-ru/.maxclients"
- 
- 
+
+
 -#define FNAME_USERLOG	"var/log/users"	
 -#define FNAME_OPERLOG	"var/log/opers"
 -#define FNAME_SYSLOG	"var/log/syslog"
 +#define FNAME_USERLOG	"/var/log/ircd-ru/users"
 +#define FNAME_OPERLOG	"/var/log/ircd-ru/opers"
 +#define FNAME_SYSLOG	"/var/log/ircd-ru/syslog"
- 
- 
+
+
  #endif /* !__PATHS_H__ */
diff --git a/irc/ircd-ru/pkg-plist b/irc/ircd-ru/pkg-plist
index add9d93dba0f..23203c663b1c 100644
--- a/irc/ircd-ru/pkg-plist
+++ b/irc/ircd-ru/pkg-plist
@@ -1,32 +1,35 @@
-sbin/ircd
-bin/ircdpasswd
-%%ETCDIR%%/ircd.conf-dist
-%%ETCDIR%%/ircd.motd-dist
-%%ETCDIR%%/ircd.smotd-dist
-@unexec [ -s %D/%%ETCDIR%%/kline.conf ] || rm -f %D/%%ETCDIR%%/kline.conf
-@exec [ -f %D/%%ETCDIR%%/kline.conf ] || touch %D/%%ETCDIR%%/kline.conf
-%%ETCDIR%%/ru_RU.CP1251/ircd.motd-dist
-%%ETCDIR%%/ru_RU.CP1251/ircd.smotd-dist
-%%ETCDIR%%/ru_RU.KOI8-R/ircd.conf-dist
-%%PORTDOCS%%%%DOCSDIR%%/README.Ilines
-%%PORTDOCS%%%%DOCSDIR%%/opers.txt
-%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/README
 %%DATADIR%%/codepages/cp1251.cp
 %%DATADIR%%/codepages/cp866.cp
 %%DATADIR%%/codepages/iso8859-5.cp
 %%DATADIR%%/codepages/koi8-f.cp
 %%DATADIR%%/codepages/koi8-r.cp
 %%DATADIR%%/codepages/translit.cp
-@dirrm %%ETCDIR%%/ru_RU.CP1251
-@dirrm %%ETCDIR%%/ru_RU.KOI8-R
-@dirrm %%DATADIR%%/codepages
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README.Ilines
+%%PORTDOCS%%%%DOCSDIR%%/opers.txt
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/README
+@dirrmtry %%DATADIR%%
+@dirrmtry %%DATADIR%%/codepages
+@dirrmtry %%DATADIR%%/modules
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ru_RU.KOI8-R
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -m 755 %%VARDIR%%/log/ircd-ru
-@exec chown ircd:ircd %%VARDIR%%/log/ircd-ru
-@unexec rmdir %%VARDIR%%/log/ircd-ru
-@unexec rmdir %%VARDIR%%/run/ircd-ru
-@dirrmtry %%ETCDIR%%
+@dirrmtry etc/ircd-ru
+@dirrmtry etc/ircd-ru/ru_RU.CP1251
+@dirrmtry etc/ircd-ru/ru_RU.KOI8-R
+@mode 755
+@owner ircd
+@group ircd
+%%VARDIR%%/log/ircd-ru
+%%VARDIR%%/run/ircd-ru
+@group
+@owner
+@mode
+bin/ircdpasswd
+etc/ircd-ru/ircd.conf-dist
+etc/ircd-ru/ircd.motd-dist
+etc/ircd-ru/ircd.smotd-dist
+etc/ircd-ru/kline.conf
+etc/ircd-ru/ru_RU.CP1251/ircd.motd-dist
+etc/ircd-ru/ru_RU.CP1251/ircd.smotd-dist
+etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
+sbin/ircd