diff options
author | dougb <dougb@FreeBSD.org> | 2012-08-15 09:04:30 +0800 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2012-08-15 09:04:30 +0800 |
commit | 320cd1ea2d17c86179fa69a8da5584397ab2a2e1 (patch) | |
tree | b03e7cfe150ed1b6857b68211969a31d1b599c54 /irc | |
parent | 5a2fb644bcdcc0667463dfc374adb0058abbdd9d (diff) | |
download | freebsd-ports-gnome-320cd1ea2d17c86179fa69a8da5584397ab2a2e1.tar.gz freebsd-ports-gnome-320cd1ea2d17c86179fa69a8da5584397ab2a2e1.tar.zst freebsd-ports-gnome-320cd1ea2d17c86179fa69a8da5584397ab2a2e1.zip |
Fix problem introduced in r302141. The directory for the unpacked source
files is unversioned, so it conflicts with the name of the rc.d script in
WRKDIR after SUB_FILES is applied.
Diffstat (limited to 'irc')
-rw-r--r-- | irc/inspircd12/Makefile | 4 | ||||
-rw-r--r-- | irc/tircd/Makefile | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/irc/inspircd12/Makefile b/irc/inspircd12/Makefile index fe7ea00af27a..0570403b5487 100644 --- a/irc/inspircd12/Makefile +++ b/irc/inspircd12/Makefile @@ -18,7 +18,6 @@ CONFLICTS= inspircd-2.* LATEST_LINK= inspircd12 -WRKSRC= ${WRKDIR}/inspircd USE_BZIP2= yes USE_LDCONFIG= ${PREFIX}/lib/inspircd USE_RC_SUBR= inspircd @@ -178,6 +177,9 @@ PLIST_SUB+= ZIPLINK="@comment " CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: ${REINPLACE_CMD} -e '/INSTMODE/s|700|755|;/install -d.*BINPATH/d'\ -e 's,FLAGS = @FLAGS@,FLAGS = ${CXXFLAGS} @FLAGS@,' \ diff --git a/irc/tircd/Makefile b/irc/tircd/Makefile index cfce7ab1274e..4f68518b5f43 100644 --- a/irc/tircd/Makefile +++ b/irc/tircd/Makefile @@ -24,14 +24,15 @@ RUN_DEPENDS= p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \ p5-POE>=0:${PORTSDIR}/devel/p5-POE \ p5-POE-Filter-IRCD>=0:${PORTSDIR}/irc/p5-POE-Filter-IRCD -WRKSRC= ${WRKDIR}/tircd - USE_PERL5= yes NO_BUILD= yes MAN1= tircd.1 USE_RC_SUBR= tircd +post-extract: + @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: ${REINPLACE_CMD} -e '1s,^#!/usr/bin/perl,#!${PREFIX}/bin/perl,' \ -e 's,/etc/tircd.cfg,${PREFIX}/etc/tircd.cfg,g' \ |