Bug 183883 - [patch] irc/ircservices bug fixing, STAGE supporting.
Summary: [patch] irc/ircservices bug fixing, STAGE supporting.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-12 08:40 UTC by ru_M1cRO
Modified: 2013-11-26 00:20 UTC (History)
0 users

See Also:


Attachments
file.diff (1.81 KB, patch)
2013-11-12 08:40 UTC, ru_M1cRO
no flags Details | Diff
patch-ircservices.diff (1.79 KB, patch)
2013-11-12 13:27 UTC, ru_M1cRO
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description ru_M1cRO 2013-11-12 08:40:00 UTC
[patch] irc/ircservices bug fixing, STAGE supporting.
- Now it always building(should use just gcc)
- Added STAGE support.

Fix: Patch attached with submission follows:
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2013-11-12 10:55:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 2 ru_M1cRO 2013-11-12 13:27:01 UTC
12.11.2013, 12:40, "FreeBSD-gnats-submit@FreeBSD.org" <FreeBSD-gnats-submit@FreeBSD.org>:
> Thank you very much for your problem report.
> It has the internal identification `ports/183883'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=183883
>
>> Category: ports
>> Responsible: freebsd-ports-bugs
>> Synopsis: [patch] irc/ircservices bug fixing, STAGE supporting.
>> Arrival-Date: Tue Nov 12 08:40:00 UTC 2013

Hi there,

Patch with some fixes was attached.

-- 
With Best Regards,
Ilya A. Arkhipov
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2013-11-19 23:28:31 UTC
State Changed
From-To: open->feedback

Ask for maintainer fix. Absolute paths to staging dir get hardcoded in 
the binary, maintainer was informed via IRC.
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2013-11-25 22:43:23 UTC
State Changed
From-To: feedback->open

Maintainer has sent new patch via email.
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-11-26 00:15:32 UTC
Author: madpilot
Date: Tue Nov 26 00:15:25 2013
New Revision: 334909
URL: http://svnweb.freebsd.org/changeset/ports/334909

Log:
  - Force gcc usage, port depends on gnu extensions
  - Add LICENSE
  - Convert to staging
  - Remove compatibility bits for unsupported OS versions
  
  PR:		ports/183883
  Submitted by:	Ilya A. Arkhipov <rum1cro@yandex.ru> (maintainer)

Modified:
  head/irc/ircservices/Makefile

Modified: head/irc/ircservices/Makefile
==============================================================================
--- head/irc/ircservices/Makefile	Tue Nov 26 00:07:41 2013	(r334908)
+++ head/irc/ircservices/Makefile	Tue Nov 26 00:15:25 2013	(r334909)
@@ -11,23 +11,25 @@ MASTER_SITES=	http://www.ircservices.za.
 MAINTAINER=	rum1cro@yandex.ru
 COMMENT=	A system of IRC services for IRC networks
 
+LICENSE=	GPLv2
+
 USES=		gmake perl5
+USE_GCC=	any
 USE_PERL5=	build
 HAS_CONFIGURE=	yes
 USE_RC_SUBR=	ircservices
+SUB_FILES=	pkg-message
 
 DIST_SUBDIR=	${PORTNAME}
-CONFIGURE_ARGS=	-bindest ${PREFIX}/sbin -datdest ${PREFIX}/etc/ircservices -cflags "${CFLAGS}" -cc "${CC}"
+CONFIGURE_ARGS=	-bindest ${PREFIX}/sbin -datdest ${PREFIX}/etc/ircservices \
+				-cflags "${CFLAGS}" -cc "${CC}"
+MAKE_JOBS_UNSAFE=	yes
+NEED_ROOT=	yes
 
 IRCSERVICES_LANG?=	EN_US
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700042
-CFLAGS+=	-fno-stack-protector
-.endif
-
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
@@ -41,19 +43,19 @@ pre-patch:
 	@${ECHO_MSG} "DE EN_US ES FR HU IT JA_EUC JA_SJIS NL PT TR"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|LANG_EN_US|LANG_${IRCSERVICES_LANG}|' \
+	@${REINPLACE_CMD} -e 's#LANG_EN_US#LANG_${IRCSERVICES_LANG}#' \
 		${WRKSRC}/defs.h
 
+post-build:
+	@${REINPLACE_CMD} -e 's#BINDEST=.*#BINDEST=${STAGEDIR}${PREFIX}/sbin# ; \
+		s#DATDEST=.*#DATDEST=${STAGEDIR}${PREFIX}/etc/ircservices#' \
+			${WRKSRC}/Makefile.inc
+	@${REINPLACE_CMD} -e 's#@BINDEST@#${PREFIX}/sbin# ; \
+		s#@DATDEST@#${PREFIX}/etc/ircservices#' \
+			${WRKSRC}/tools/ircservices-chk.in
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "**********          IMPORTANT           **********"
-	@${ECHO_MSG} "The configuration directory has changed to ${PREFIX}/etc/ircservices"
-	@${ECHO_MSG} "Please copy your old config files there if updating"
-	@${ECHO_MSG} "**********          IMPORTANT           *********"
-	@${ECHO_MSG} ""
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Guido Falsi freebsd_committer freebsd_triage 2013-11-26 00:15:34 UTC
State Changed
From-To: open->closed

Committed. Thanks!