Sun Nov 2 05:35:39 2014 UTC ()
Fixes unusual MESSAGE_SRC usage.


(obache)
diff -r1.39 -r1.40 pkgsrc/chat/unrealircd/Makefile
diff -r1.12 -r1.13 pkgsrc/chat/unrealircd/options.mk
cvs diff -r1.39 -r1.40 pkgsrc/chat/unrealircd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/unrealircd/Makefile 2014/02/12 23:17:37 1.39
+++ pkgsrc/chat/unrealircd/Makefile 2014/11/02 05:35:39 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2014/02/12 23:17:37 tron Exp $ 1# $NetBSD: Makefile,v 1.40 2014/11/02 05:35:39 obache Exp $
2 2
3DISTNAME= Unreal3.2.10.1 3DISTNAME= Unreal3.2.10.1
4PKGNAME= ${DISTNAME:tl:S/l/lircd-/1} 4PKGNAME= ${DISTNAME:tl:S/l/lircd-/1}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= http://unrealircd.com/downloads/ 7MASTER_SITES= http://unrealircd.com/downloads/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.unrealircd.com/ 10HOMEPAGE= http://www.unrealircd.com/
11COMMENT= Advanced IRC server with IPv6 and SSL support 11COMMENT= Advanced IRC server with IPv6 and SSL support
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14CONFLICTS+= ircu-[0-9]* 14CONFLICTS+= ircu-[0-9]*
@@ -62,27 +62,27 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.c @@ -62,27 +62,27 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.c
62 ${UIRCD_USER} ${UIRCD_GROUP} 0660 62 ${UIRCD_USER} ${UIRCD_GROUP} 0660
63 63
64PKG_USERS_VARS+= UIRCD_USER 64PKG_USERS_VARS+= UIRCD_USER
65PKG_GROUPS_VARS+= UIRCD_GROUP 65PKG_GROUPS_VARS+= UIRCD_GROUP
66 66
67PKG_GROUPS= ${UIRCD_GROUP:Q} 67PKG_GROUPS= ${UIRCD_GROUP:Q}
68PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q} 68PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q}
69 69
70PKG_GECOS.${UIRCD_USER}= UnrealIRCD user 70PKG_GECOS.${UIRCD_USER}= UnrealIRCD user
71PKG_HOME.${UIRCD_USER}= ${UIRCD_HOME} 71PKG_HOME.${UIRCD_USER}= ${UIRCD_HOME}
72 72
73RCD_SCRIPTS= unrealircd 73RCD_SCRIPTS= unrealircd
74 74
75MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC 75MESSAGE_SRC+= MESSAGE
76MESSAGE_SUBST+= UIRCD_HOME=${UIRCD_HOME:Q} 76MESSAGE_SUBST+= UIRCD_HOME=${UIRCD_HOME:Q}
77FILES_SUBST+= UIRCD_HOME=${UIRCD_HOME:Q} 77FILES_SUBST+= UIRCD_HOME=${UIRCD_HOME:Q}
78FILES_SUBST+= UIRCD_USER=${UIRCD_USER:Q} 78FILES_SUBST+= UIRCD_USER=${UIRCD_USER:Q}
79FILES_SUBST+= UIRCD_GROUP=${UIRCD_GROUP:Q} 79FILES_SUBST+= UIRCD_GROUP=${UIRCD_GROUP:Q}
80 80
81SUBST_CLASSES+= homedir 81SUBST_CLASSES+= homedir
82SUBST_STAGE.homedir= post-patch 82SUBST_STAGE.homedir= post-patch
83SUBST_FILES.homedir= doc/example.conf 83SUBST_FILES.homedir= doc/example.conf
84SUBST_SED.homedir= -e "s|src/modules|${IRCD_SHARE}/modules|g" 84SUBST_SED.homedir= -e "s|src/modules|${IRCD_SHARE}/modules|g"
85SUBST_SED.homedir+= -e "s|include \"|include \"${IRCD_SHARE}/|g" 85SUBST_SED.homedir+= -e "s|include \"|include \"${IRCD_SHARE}/|g"
86SUBST_MESSAGE.homedir= Fixing home directory of the IRC server. 86SUBST_MESSAGE.homedir= Fixing home directory of the IRC server.
87 87
88.if !empty(PKG_OPTIONS:Munrealircd-chroot) 88.if !empty(PKG_OPTIONS:Munrealircd-chroot)
@@ -100,32 +100,26 @@ OWN_DIRS_PERMS+= ${UIRCD_HOME:Q}/tmp ${U @@ -100,32 +100,26 @@ OWN_DIRS_PERMS+= ${UIRCD_HOME:Q}/tmp ${U
100INSTALLATION_DIRS= sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \ 100INSTALLATION_DIRS= sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \
101 ${IRCD_SHARE}/modules 101 ${IRCD_SHARE}/modules
102 102
103.if ${OPSYS} == "Darwin" 103.if ${OPSYS} == "Darwin"
104INSTALL_UNSTRIPPED=YES 104INSTALL_UNSTRIPPED=YES
105.endif 105.endif
106 106
107CFLAGS.SunOS+= -DUSE_LOCALE 107CFLAGS.SunOS+= -DUSE_LOCALE
108 108
109.include "../../net/libcares/buildlink3.mk" 109.include "../../net/libcares/buildlink3.mk"
110.include "../../mk/pthread.buildlink3.mk" 110.include "../../mk/pthread.buildlink3.mk"
111.include "../../devel/tre/buildlink3.mk" 111.include "../../devel/tre/buildlink3.mk"
112 112
113post-build: 
114 ${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC 
115.if !empty(PKG_OPTIONS:Minet6) 
116 ${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6 
117.endif 
118 
119do-install: 113do-install:
120 ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ircd ${DESTDIR}${PREFIX}/sbin 114 ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ircd ${DESTDIR}${PREFIX}/sbin
121 ${INSTALL_DATA} ${WRKSRC:Q}/aliases/*.conf \ 115 ${INSTALL_DATA} ${WRKSRC:Q}/aliases/*.conf \
122 ${DESTDIR}${IRCD_SHARE:Q}/aliases 116 ${DESTDIR}${IRCD_SHARE:Q}/aliases
123 ${INSTALL_DATA} ${WRKSRC:Q}/badwords*.conf ${DESTDIR}${IRCD_SHARE:Q} 117 ${INSTALL_DATA} ${WRKSRC:Q}/badwords*.conf ${DESTDIR}${IRCD_SHARE:Q}
124 ${INSTALL_DATA} ${WRKSRC:Q}/help.* ${DESTDIR}${IRCD_SHARE:Q} 118 ${INSTALL_DATA} ${WRKSRC:Q}/help.* ${DESTDIR}${IRCD_SHARE:Q}
125 ${INSTALL_DATA} ${WRKSRC:Q}/doc/help.* ${DESTDIR}${IRCD_SHARE:Q} 119 ${INSTALL_DATA} ${WRKSRC:Q}/doc/help.* ${DESTDIR}${IRCD_SHARE:Q}
126 ${INSTALL_DATA} ${WRKSRC:Q}/spamfilter.conf ${DESTDIR}${IRCD_SHARE:Q} 120 ${INSTALL_DATA} ${WRKSRC:Q}/spamfilter.conf ${DESTDIR}${IRCD_SHARE:Q}
127 ${INSTALL_LIB} ${WRKSRC:Q}/src/modules/*.so \ 121 ${INSTALL_LIB} ${WRKSRC:Q}/src/modules/*.so \
128 ${DESTDIR}${IRCD_SHARE:Q}/modules 122 ${DESTDIR}${IRCD_SHARE:Q}/modules
129 ${INSTALL_DATA} ${WRKSRC:Q}/doc/unreal32docs.* ${DESTDIR}${IRCD_DOCS:Q} 123 ${INSTALL_DATA} ${WRKSRC:Q}/doc/unreal32docs.* ${DESTDIR}${IRCD_DOCS:Q}
130 ${INSTALL_DATA} ${WRKSRC:Q}/doc/example.* ${DESTDIR}${IRCD_EG:Q} 124 ${INSTALL_DATA} ${WRKSRC:Q}/doc/example.* ${DESTDIR}${IRCD_EG:Q}
131 125
cvs diff -r1.12 -r1.13 pkgsrc/chat/unrealircd/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/unrealircd/options.mk 2013/07/14 15:42:34 1.12
+++ pkgsrc/chat/unrealircd/options.mk 2014/11/02 05:35:39 1.13
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: options.mk,v 1.12 2013/07/14 15:42:34 rodent Exp $ 1# $NetBSD: options.mk,v 1.13 2014/11/02 05:35:39 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.unrealircd 3PKG_OPTIONS_VAR= PKG_OPTIONS.unrealircd
4 4
5PKG_SUPPORTED_OPTIONS= inet6 unrealircd-nospoof unrealircd-ziplinks 5PKG_SUPPORTED_OPTIONS= inet6 unrealircd-nospoof unrealircd-ziplinks
6PKG_SUPPORTED_OPTIONS+= unrealircd-remoteinc ssl unrealircd-chroot 6PKG_SUPPORTED_OPTIONS+= unrealircd-remoteinc ssl unrealircd-chroot
7PKG_SUPPORTED_OPTIONS+= unrealircd-prefixaq unrealircd-showlistmodes 7PKG_SUPPORTED_OPTIONS+= unrealircd-prefixaq unrealircd-showlistmodes
8PKG_SUPPORTED_OPTIONS+= unrealircd-topicisnuhost unrealircd-shunnotices 8PKG_SUPPORTED_OPTIONS+= unrealircd-topicisnuhost unrealircd-shunnotices
9PKG_SUPPORTED_OPTIONS+= unrealircd-operoverride-verify inet6 9PKG_SUPPORTED_OPTIONS+= unrealircd-operoverride-verify inet6
10PKG_SUPPORTED_OPTIONS+= unrealircd-no-operoverride unrealircd-disableusermod 10PKG_SUPPORTED_OPTIONS+= unrealircd-no-operoverride unrealircd-disableusermod
11PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes unrealircd-prefixaq 11PKG_SUGGESTED_OPTIONS= unrealircd-showlistmodes unrealircd-prefixaq
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15### 15###
16### Enable IPv6 support 16### Enable IPv6 support
17### 17###
18.if !empty(PKG_OPTIONS:Minet6) 18.if !empty(PKG_OPTIONS:Minet6)
19CONFIGURE_ARGS+= --enable-inet6 19CONFIGURE_ARGS+= --enable-inet6
20MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC.inet6 20MESSAGE_SRC+= MESSAGE_SRC.inet6
21.else 21.else
22CONFIGURE_ARGS+= --disable-inet6 22CONFIGURE_ARGS+= --disable-inet6
23CONFIGURE_ENV+= ac_cv_ip6=no 23CONFIGURE_ENV+= ac_cv_ip6=no
24.endif 24.endif
25 25
26### 26###
27### Enable SSL support 27### Enable SSL support
28### 28###
29.if !empty(PKG_OPTIONS:Mssl) 29.if !empty(PKG_OPTIONS:Mssl)
30. include "../../security/openssl/buildlink3.mk" 30. include "../../security/openssl/buildlink3.mk"
31CONFIGURE_ARGS+= --enable-ssl=${SSLBASE:Q} 31CONFIGURE_ARGS+= --enable-ssl=${SSLBASE:Q}
32.endif 32.endif
33 33