ports/184338: [PATCH] irc/ircd-ru: [STAGING Support]

Ilya A. Arkhipov rum1cro at yandex.ru
Wed Nov 27 21:00:00 UTC 2013 

>Number:         184338
>Category:       ports
>Synopsis:       [PATCH] irc/ircd-ru: [STAGING Support]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 27 21:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ilya A. Arkhipov
>Release:        10.0-CURRENT(it's not a current ;(()
>Organization:
Home Inc. ^_^
>Environment:
>Description:
[PATCH] for irc/ircd-ru
- Added STAGING Support
- Added License
- Some style
- New correct MASTER_SITE
>How-To-Repeat:

>Fix:
patch you can find there http://m1cro.tk/ports/irc/ircd-ru/ircd_STAGING.patch , also

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 335040)
+++ Makefile	(working copy)
@@ -4,16 +4,17 @@
 PORTNAME=	ircd-ru
 PORTVERSION=	1.0.7
 PORTREVISION=	6
-CATEGORIES=	irc russian
-MASTER_SITES=	http://link.wenet.su/
+CATEGORIES=	russian irc
+MASTER_SITES=	http://m1cro.tk/ports/distfiles/
 DISTNAME=	ircd-RU-${PORTVERSION}-03-rc-20090810
 
 MAINTAINER=	rum1cro at yandex.ru
 COMMENT=	An irc daemon with translation schemes and other useful features
 
+LICENSE=	GPLv1
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-SUB_FILES=	pkg-message
 USE_RC_SUBR=	ircd
 WRKSRC=		${WRKDIR}/ircd-RU-${PORTVERSION}-03-rc
 
@@ -20,10 +21,11 @@
 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 @@
 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 @@
 # enable RC4 crypt (server to server connection)
 .if ${PORT_OPTIONS:MENCRYPTION}
 CONFIGURE_ARGS+=--enable-encryption
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 .endif
 
 # log to file instead of syslog
@@ -79,8 +80,11 @@
 
 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
+	@${REINPLACE_CMD} -e 's#@prefix@#${STAGEDIR}${PREFIX}#' \
+		${WRKSRC}/include/paths.h.in
 
 pre-build:
 	@${ECHO_MSG} ""
@@ -89,7 +93,7 @@
 	@${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>
Index: files/patch-paths.h.in
===================================================================
--- files/patch-paths.h.in	(revision 335040)
+++ files/patch-paths.h.in	(working copy)
@@ -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 at BIN_SUF@"
 +#define SPATH		"sbin/ircd at 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,13 +26,13 @@
 +#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"
@@ -39,6 +39,6 @@
 +#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__ */
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 335040)
+++ pkg-plist	(working copy)
@@ -1,17 +1,3 @@
-sbin/ircd
-bin/ircdpasswd
-%%ETCDIR%%/ircd.conf-dist
-%%ETCDIR%%/ircd.motd-dist
-%%ETCDIR%%/ircd.smotd-dist
- at unexec [ -s %D/%%ETCDIR%%/kline.conf ] || rm -f %D/%%ETCDIR%%/kline.conf
- at 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
@@ -18,15 +4,32 @@
 %%DATADIR%%/codepages/koi8-f.cp
 %%DATADIR%%/codepages/koi8-r.cp
 %%DATADIR%%/codepages/translit.cp
- at dirrm %%ETCDIR%%/ru_RU.CP1251
- at dirrm %%ETCDIR%%/ru_RU.KOI8-R
- at dirrm %%DATADIR%%/codepages
- at dirrm %%DATADIR%%/modules
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru_RU.KOI8-R
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec mkdir -m 755 %%VARDIR%%/log/ircd-ru
- at exec chown ircd:ircd %%VARDIR%%/log/ircd-ru
- at unexec rmdir %%VARDIR%%/log/ircd-ru
- at unexec rmdir %%VARDIR%%/run/ircd-ru
- at dirrmtry %%ETCDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README.Ilines
+%%PORTDOCS%%%%DOCSDIR%%/opers.txt
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/README
+ at dirrmtry %%DATADIR%%
+ at dirrmtry %%DATADIR%%/codepages
+ at dirrmtry %%DATADIR%%/modules
+ at dirrmtry %%PORTDOCS%%%%DOCSDIR%%
+ at dirrmtry %%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R
+ at dirrmtry etc/ircd-ru
+ at dirrmtry etc/ircd-ru/ru_RU.CP1251
+ at dirrmtry etc/ircd-ru/ru_RU.KOI8-R
+ at mode 755
+ at owner ircd
+ at group ircd
+%%VARDIR%%/log/ircd-ru
+%%VARDIR%%/run/ircd-ru
+ at group
+ at owner
+ at 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


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list