- maintenance update to 0.2.4.2 from Arnaud Bergeron (MAINTAINER)

- convert @perl goo to SUBST_CMD

"looks good" pval@
This commit is contained in:
okan 2008-06-09 23:46:20 +00:00
parent cdcb0ccc3a
commit 9298370ad5
7 changed files with 38 additions and 41 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2007/09/15 21:26:02 simon Exp $
# $OpenBSD: Makefile,v 1.8 2008/06/09 23:46:20 okan Exp $
COMMENT= multi-threaded DAAP server
DISTNAME= mt-daapd-0.2.4
PKGNAME= ${DISTNAME}p1
DISTNAME= mt-daapd-0.2.4.2
CATEGORIES= audio net
HOMEPAGE= http://www.mt-daapd.org/
@ -36,13 +35,11 @@ CONFIGURE_ARGS+=--enable-howl --with-howl-includes=${LOCALBASE}/include/howl
.endif
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},;' \
-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},' \
${WRKSRC}/contrib/mt-daapd.conf
${SUBST_CMD} ${WRKSRC}/contrib/mt-daapd.conf
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mt-daapd
${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.* \
${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.{conf,playlist,spec} \
${PREFIX}/share/examples/mt-daapd
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (mt-daapd-0.2.4.tar.gz) = Lhzb5rlO8VPpFYBvgKKNyg==
RMD160 (mt-daapd-0.2.4.tar.gz) = urs/mKJUqkoBS15625Ynb6/IT6w=
SHA1 (mt-daapd-0.2.4.tar.gz) = uMJC5f1dLZcBDV4JufAsz53vE6s=
SHA256 (mt-daapd-0.2.4.tar.gz) = gjnru6W4FeVmiqI1vlLy6mbxqBu4D09t3aLMPmn3t+8=
SIZE (mt-daapd-0.2.4.tar.gz) = 405168
MD5 (mt-daapd-0.2.4.2.tar.gz) = Z775+xTUh2k7Dft5LD8bBQ==
RMD160 (mt-daapd-0.2.4.2.tar.gz) = kYt2/+OvewQTvhy7r90RJ09dPp0=
SHA1 (mt-daapd-0.2.4.2.tar.gz) = XxwEEAsdGKnPbwP4ebXD6ae9Fy8=
SHA256 (mt-daapd-0.2.4.2.tar.gz) = UNifd73D/QykCNUsq/9SgiT8xzGazDuUVtsOMWSjts8=
SIZE (mt-daapd-0.2.4.2.tar.gz) = 436513

View File

@ -1,22 +1,22 @@
$OpenBSD: patch-configure,v 1.3 2006/05/05 05:28:58 sturm Exp $
--- configure.orig Thu Mar 2 01:49:34 2006
+++ configure Fri May 5 07:14:34 2006
@@ -3166,7 +3166,6 @@ fi
$OpenBSD: patch-configure,v 1.4 2008/06/09 23:46:20 okan Exp $
--- configure.orig Sat Apr 19 16:17:12 2008
+++ configure Sat May 31 14:32:07 2008
@@ -3867,7 +3867,6 @@ fi
rend_posix=true
STATIC_LIBS=no
-CPPFLAGS="${CPPFLAGS} -g"
echo "$as_me:$LINENO: checking for pthread_creat in -lc_r" >&5
echo $ECHO_N "checking for pthread_creat in -lc_r... $ECHO_C" >&6
@@ -3236,13 +3235,13 @@ if test $ac_cv_lib_c_r_pthread_creat = y
{ echo "$as_me:$LINENO: checking for pthread_creat in -lc_r" >&5
echo $ECHO_N "checking for pthread_creat in -lc_r... $ECHO_C" >&6; }
@@ -3950,13 +3949,13 @@ if test $ac_cv_lib_c_r_pthread_creat = yes; then
LDFLAGS="${LDFLAGS} -lc_r"
else
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@ -26,9 +26,9 @@ $OpenBSD: patch-configure,v 1.3 2006/05/05 05:28:58 sturm Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -3301,7 +3300,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
@@ -4028,7 +4027,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then
- LDFLAGS="${LDFLAGS} -lpthread"
+ LDFLAGS="${LDFLAGS} -pthread"

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-contrib_mt-daapd_conf,v 1.1 2007/01/10 08:00:03 steven Exp $
$OpenBSD: patch-contrib_mt-daapd_conf,v 1.2 2008/06/09 23:46:20 okan Exp $
--- contrib/mt-daapd.conf.orig Wed Jan 10 08:52:43 2007
+++ contrib/mt-daapd.conf Wed Jan 10 08:53:54 2007
@@ -23,7 +23,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-contrib_mt-daapd_conf,v 1.1 2007/01/10 08:00:03 steven Exp $
#
-web_root /usr/share/mt-daapd/admin-root
+web_root !!LOCALBASE!!/share/mt-daapd/admin-root
+web_root ${LOCALBASE}/share/mt-daapd/admin-root
#
# port (required)
@ -15,7 +15,7 @@ $OpenBSD: patch-contrib_mt-daapd_conf,v 1.1 2007/01/10 08:00:03 steven Exp $
#
-playlist /etc/mt-daapd.playlist
+playlist !!SYSCONFDIR!!/mt-daapd.playlist
+playlist ${SYSCONFDIR}/mt-daapd.playlist
#
# password (optional)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_configfile_c,v 1.1 2005/10/07 20:15:13 alek Exp $
--- src/configfile.c.orig Sun Jan 30 05:32:35 2005
+++ src/configfile.c Fri Oct 7 21:50:05 2005
@@ -377,7 +377,7 @@ int config_read(char *file) {
$OpenBSD: patch-src_configfile_c,v 1.2 2008/06/09 23:46:20 okan Exp $
--- src/configfile.c.orig Sat Apr 19 15:17:23 2008
+++ src/configfile.c Sat May 31 14:29:04 2008
@@ -379,7 +379,7 @@ int config_read(char *file) {
/* sanity check the paths */
@ -10,7 +10,7 @@ $OpenBSD: patch-src_configfile_c,v 1.1 2005/10/07 20:15:13 alek Exp $
if((fin=fopen(path_buffer,"r")) == NULL) {
err=-1;
DPRINTF(E_LOG,L_CONF,"Invalid web_root\n");
@@ -737,6 +737,7 @@ void config_emit_service_status(WS_CONNI
@@ -739,6 +739,7 @@ void config_emit_service_status(WS_CONNINFO *pwsc, voi
int mdns_running;
char *html;
char buf[256];
@ -18,7 +18,7 @@ $OpenBSD: patch-src_configfile_c,v 1.1 2005/10/07 20:15:13 alek Exp $
int r_days, r_hours, r_mins, r_secs;
int scanning;
@@ -795,21 +796,28 @@ void config_emit_service_status(WS_CONNI
@@ -797,21 +798,28 @@ void config_emit_service_status(WS_CONNINFO *pwsc, voi
r_mins=r_secs/60;
r_secs -= 60 * r_mins;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_mDNSUNP_c,v 1.1 2007/01/09 10:15:15 millert Exp $
--- src/mDNSUNP.c.orig Sun Jan 7 18:10:01 2007
+++ src/mDNSUNP.c Sun Jan 7 18:12:28 2007
@@ -159,22 +159,8 @@
$OpenBSD: patch-src_mDNSUNP_c,v 1.2 2008/06/09 23:46:20 okan Exp $
--- src/mDNSUNP.c.orig Sat Apr 19 15:17:23 2008
+++ src/mDNSUNP.c Sat May 31 14:29:04 2008
@@ -159,22 +159,8 @@ struct ifi_info *get_ifi_info(int family, int doaliase
/* include get_ifi_info2 */
for (ptr = buf; ptr < buf + ifc.ifc_len; ) {
ifr = (struct ifreq *) ptr;

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2005/10/07 20:15:13 alek Exp $
sbin/mt-daapd
@comment $OpenBSD: PLIST,v 1.3 2008/06/09 23:46:20 okan Exp $
@bin sbin/mt-daapd
share/examples/mt-daapd/
share/examples/mt-daapd/mt-daapd.conf
@sample ${SYSCONFDIR}/mt-daapd.conf