2 files changed, 57 insertions, 48 deletions

diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 7b00c3c8d88c..2453fb8e9784 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -5,24 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=		mediatomb
+PORTNAME=	mediatomb
 PORTVERSION=	0.9.0
-CATEGORIES=		net multimedia
+CATEGORIES=	net multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	leo@mediatomb.cc
 COMMENT=	UPnP AV MediaServer
 
-MAN1=	mediatomb.1
+MAN1=		mediatomb.1
 GNU_CONFIGURE=	yes
-LDFLAGS+=		${PTHREAD_LIBS}
-CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-search="${LOCALBASE}"
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-				PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-				LDFLAGS="${LDFLAGS}" \
-				CFLAGS="${CFLAGS}"
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS}"
 USE_RC_SUBR=	mediatomb.sh
 
 # --- configurable variables ---
@@ -32,28 +32,28 @@ MEDIATOMB_DIR?=		/var/mediatomb
 MEDIATOMB_MASK?=	750
 # ---
 
-SUB_FILES=		config.xml.dist \
-				pkg-install \
-				pkg-deinstall
+SUB_FILES=	config.xml.dist \
+		pkg-install \
+		pkg-deinstall
 
-SUB_LIST=		MEDIATOMB_USER=${MEDIATOMB_USER} \
-				MEDIATOMB_GROUP=${MEDIATOMB_GROUP} \
-				MEDIATOMB_DIR=${MEDIATOMB_DIR} \
-				MEDIATOMB_MASK=${MEDIATOMB_MASK}
+SUB_LIST=	MEDIATOMB_USER=${MEDIATOMB_USER} \
+		MEDIATOMB_GROUP=${MEDIATOMB_GROUP} \
+		MEDIATOMB_DIR=${MEDIATOMB_DIR} \
+		MEDIATOMB_MASK=${MEDIATOMB_MASK}
 
-PLIST_SUB=		MEDIATOMB_USER=${MEDIATOMB_USER} \
-				MEDIATOMB_GROUP=${MEDIATOMB_GROUP} \
-				MEDIATOMB_DIR=${MEDIATOMB_DIR} \
-				MEDIATOMB_MASK=${MEDIATOMB_MASK} \
+PLIST_SUB=	MEDIATOMB_USER=${MEDIATOMB_USER} \
+		MEDIATOMB_GROUP=${MEDIATOMB_GROUP} \
+		MEDIATOMB_DIR=${MEDIATOMB_DIR} \
+		MEDIATOMB_MASK=${MEDIATOMB_MASK} \
 
 OPTIONS=	SQLITE3 "sqlite3 support" on \
-			MYSQL "MySQL support" on \
-			JS "JavaScript (SpiderMonkey) support" on \
-			LIBEXIF "libexif support" on \
-			ID3LIB "id3lib support" on \
-			TAGLIB "taglib support" off \
-			LIBEXTRACTOR "libextractor support" off \
-			DEBUG "debug build" off
+		MYSQL "MySQL support" on \
+		JS "JavaScript (SpiderMonkey) support" on \
+		LIBEXIF "libexif support" on \
+		ID3LIB "id3lib support" on \
+		TAGLIB "taglib support" off \
+		LIBEXTRACTOR "libextractor support" off \
+		DEBUG "debug build" off
 
 .include <bsd.port.pre.mk>
 
@@ -63,8 +63,8 @@ IGNORE=	is useless without a database. Please (re)run 'make config' and choose e
 
 .if defined(WITH_SQLITE3)
 CONFIGURE_ARGS+=	--enable-sqlite3 \
-					--with-sqlite3-h="${LOCALBASE}/include" \
-					--with-sqlite3-libs="${LOCALBASE}/lib"
+			--with-sqlite3-h="${LOCALBASE}/include" \
+			--with-sqlite3-libs="${LOCALBASE}/lib"
 LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
 .else
 CONFIGURE_ARGS+=	--disable-sqlite3
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=	--disable-sqlite3
 
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--enable-mysql \
-					--with-mysql-cfg="${LOCALBASE}/bin/mysql_config"
+			--with-mysql-cfg="${LOCALBASE}/bin/mysql_config"
 LIB_DEPENDS+=		mysqlclient_r:${PORTSDIR}/databases/mysql50-client
 .else
 CONFIGURE_ARGS+=	--disable-mysql
@@ -80,8 +80,8 @@ CONFIGURE_ARGS+=	--disable-mysql
 
 .if defined(WITH_JS)
 CONFIGURE_ARGS+=	--enable-libjs \
-					--with-js-h="${LOCALBASE}/include" \
-					--with-js-libs="${LOCALBASE}/lib"
+			--with-js-h="${LOCALBASE}/include" \
+			--with-js-libs="${LOCALBASE}/lib"
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
 RUN_DEPENDS+=		${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
 .else
@@ -90,8 +90,8 @@ CONFIGURE_ARGS+=	--disable-libjs
 
 .if defined(WITH_LIBEXIF)
 CONFIGURE_ARGS+=	--enable-libexif \
-					--with-exif-h="${LOCALBASE}/include" \
-					--with-exif-libs="${LOCALBASE}/lib"
+			--with-exif-h="${LOCALBASE}/include" \
+			--with-exif-libs="${LOCALBASE}/lib"
 LIB_DEPENDS+=		exif:${PORTSDIR}/graphics/libexif
 .else
 CONFIGURE_ARGS+=	--disable-libexif
@@ -103,8 +103,8 @@ IGNORE=	cannot be compiled with both, taglib and id3lib. Please (re)run 'make co
 
 .if defined(WITH_ID3LIB)
 CONFIGURE_ARGS+=	--enable-id3lib \
-					--with-id3lib-h="${LOCALBASE}/include" \
-					--with-id3lib-libs="${LOCALBASE}/lib"
+			--with-id3lib-h="${LOCALBASE}/include" \
+			--with-id3lib-libs="${LOCALBASE}/lib"
 LIB_DEPENDS+=		id3:${PORTSDIR}/audio/id3lib
 .else
 CONFIGURE_ARGS+=	--disable-id3lib
@@ -112,7 +112,7 @@ CONFIGURE_ARGS+=	--disable-id3lib
 
 .if defined(WITH_TAGLIB)
 CONFIGURE_ARGS+=	--enable-taglib \
-					--with-taglib-cfg="${LOCALBASE}/bin/taglib-config"
+			--with-taglib-cfg="${LOCALBASE}/bin/taglib-config"
 LIB_DEPENDS+=		tag:${PORTSDIR}/audio/taglib
 .else
 CONFIGURE_ARGS+=	--disable-taglib
@@ -120,8 +120,8 @@ CONFIGURE_ARGS+=	--disable-taglib
 
 .if defined(WITH_LIBEXTRACTOR)
 CONFIGURE_ARGS+=	--enable-libextractor \
-					--with-extractor-h="${LOCALBASE}/include" \
-					--with-extractor-libs="${LOCALBASE}/lib"
+			--with-extractor-h="${LOCALBASE}/include" \
+			--with-extractor-libs="${LOCALBASE}/lib"
 LIB_DEPENDS+=		extractor:${PORTSDIR}/textproc/libextractor
 .else
 CONFIGURE_ARGS+=	--disable-libextractor
@@ -137,13 +137,13 @@ pre-install:
 		PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-		@${MKDIR} -m ${MEDIATOMB_MASK} -p ${PREFIX}/etc/mediatomb
-		@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${PREFIX}/etc/mediatomb
-		@${INSTALL} ${COPY} -o ${MEDIATOMB_USER} -g ${MEDIATOMB_GROUP} -m 640 ${WRKDIR}/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml.dist
-		@if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \
-			${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml ; \
-		fi
-		@${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR}
-		@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR}
+	@${MKDIR} -m ${MEDIATOMB_MASK} -p ${PREFIX}/etc/mediatomb
+	@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${PREFIX}/etc/mediatomb
+	@${INSTALL} ${COPY} -o ${MEDIATOMB_USER} -g ${MEDIATOMB_GROUP} -m 640 ${WRKDIR}/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml.dist
+	@if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \
+		${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml ; \
+	fi
+	@${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR}
+	@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/mediatomb/files/patch-configure b/net/mediatomb/files/patch-configure
index eb30d80cd2b2..d56c373a2bc1 100644
--- a/net/mediatomb/files/patch-configure
+++ b/net/mediatomb/files/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	Thu Mar 29 23:04:32 2007
-+++ configure	Thu Mar 29 23:24:30 2007
+--- configure.orig	Wed Apr 18 00:30:20 2007
++++ configure	Wed Apr 18 00:35:27 2007
+@@ -17349,7 +17349,7 @@
+ 
+ if test "x$SQLITE3_OK" = xyes; then
+     if test -n "$SQLITE3_SEARCH_LIBS"; then
+-        LDFLAGS="-L$SQLITE3_SEARCH_LIBS $RT_LIBS"
++        LDFLAGS="$LDFLAGS -L$SQLITE3_SEARCH_LIBS $RT_LIBS"
+         { echo "$as_me:$LINENO: Will search for sqlite3 libraries in $withval" >&5
+ echo "$as_me: Will search for sqlite3 libraries in $withval" >&6;}
+         echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
 @@ -23239,7 +23239,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
  echo "${ECHO_T}$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6