Stuart Henderson <s...@spacehopper.org> writes:
> On 2014/01/09 07:58, Jeremie Courreges-Anglas wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by: j...@cvs.openbsd.org 2014/01/09 07:58:51
>>
>> Modified files:
>> net/irssi : Makefile
>> net/irssi/pkg : PLIST
>>
>> Log message:
>> Install irssi include files, needed to compile some irssi plugins.
>> Patch from Florian Stinglmayr, maintainer timeout.
>>
>
> If we're doing this, then it probably makes sense to use these
> rather than the :configure target in the irssi plugins in ports..
Here's a diff for the icb and xmpp plugins (icb tested).
Index: irssi-icb/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-icb/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- irssi-icb/Makefile 21 Mar 2013 08:46:34 -0000 1.31
+++ irssi-icb/Makefile 9 Jan 2014 15:38:56 -0000
@@ -12,7 +12,7 @@ CATEGORIES= net
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
- net/irssi:configure \
+ net/irssi \
devel/glib2
RUN_DEPENDS= net/irssi
@@ -25,13 +25,10 @@ LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION=2.61
AUTOMAKE_VERSION=1.9
-CONFIGURE_ARGS+= --with-irssi=${WRKDIR}/irssi-src
+CONFIGURE_ARGS+= --with-irssi=${LOCALBASE}/include/irssi/
AUTO_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
-post-extract:
- @ln -sf ${WRKDIR}/net/irssi/irssi-* ${WRKDIR}/irssi-src
pre-configure:
cd ${WRKSRC} && ${AUTO_ENV} aclocal
Index: irssi-icb/distinfo
===================================================================
RCS file: /cvs/ports/net/irssi-icb/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- irssi-icb/distinfo 5 Apr 2007 16:20:10 -0000 1.4
+++ irssi-icb/distinfo 9 Jan 2014 15:41:56 -0000
@@ -1,5 +1,2 @@
-MD5 (irssi-icb-0.14.tar.gz) = V34uonr7IQhqjwj8yVMtBA==
-RMD160 (irssi-icb-0.14.tar.gz) = 3RBJJezm6r0BErhrnraJiEa6j1I=
-SHA1 (irssi-icb-0.14.tar.gz) = Mdel0EqJbg4Z20S012t6yFrxpdQ=
SHA256 (irssi-icb-0.14.tar.gz) = NEP9e5fgtkoiRJSDuRfi5aqAsIsY3WTGIT9qO3Vkmyg=
SIZE (irssi-icb-0.14.tar.gz) = 172647
Index: irssi-xmpp/Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- irssi-xmpp/Makefile 17 Jul 2013 03:27:01 -0000 1.4
+++ irssi-xmpp/Makefile 9 Jan 2014 15:41:30 -0000
@@ -22,17 +22,14 @@ MASTER_SITES= ${HOMEPAGE}files/
MODULES= devel/gettext
-BUILD_DEPENDS= net/irssi:configure
+BUILD_DEPENDS= net/irssi
LIB_DEPENDS= net/loudmouth
RUN_DEPENDS= net/irssi
-MAKE_FLAGS= CC="${CC}" IRSSI_INCLUDE="${WRKDIR}/irssi-src"
+MAKE_FLAGS= CC="${CC}" IRSSI_INCLUDE="${LOCALBASE}/include/irssi/"
MAKE_ENV= LDFLAGS="${LDFLAGS}"
FAKE_FLAGS= DESTDIR=""
NO_TEST= Yes
-
-post-extract:
- @ln -sf ${WRKDIR}/net/irssi/irssi-* ${WRKDIR}/irssi-src
.include <bsd.port.mk>
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
(previous: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494)
