From owner-svn-ports-all@FreeBSD.ORG Sat May 31 15:23:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6F75CBE; Sat, 31 May 2014 15:23:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93F0921C6; Sat, 31 May 2014 15:23:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VFNj6M072325; Sat, 31 May 2014 15:23:45 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VFNjiO072322; Sat, 31 May 2014 15:23:45 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405311523.s4VFNjiO072322@svn.freebsd.org> From: John Marino Date: Sat, 31 May 2014 15:23:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355992 - in head/audio/xmcd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2014 15:23:45 -0000 Author: marino Date: Sat May 31 15:23:44 2014 New Revision: 355992 URL: http://svnweb.freebsd.org/changeset/ports/355992 QAT: https://qat.redports.org/buildarchive/r355992/ Log: audio/xmcd: Unbreak on !amd64, support DragonFly The staging attempted didn't go quite right as it was hardcoded for FreeBSD 9 AMD. Since I'm fixing this anyway, bring in dports patches to support DragonFly. Added: head/audio/xmcd/files/patch-install.sh (contents, props changed) Deleted: head/audio/xmcd/files/patch-ag Modified: head/audio/xmcd/Makefile head/audio/xmcd/pkg-plist Modified: head/audio/xmcd/Makefile ============================================================================== --- head/audio/xmcd/Makefile Sat May 31 15:21:36 2014 (r355991) +++ head/audio/xmcd/Makefile Sat May 31 15:23:44 2014 (r355992) @@ -3,7 +3,7 @@ PORTNAME= xmcd PORTVERSION= 3.3.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= audio MASTER_SITES= http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/ @@ -16,11 +16,11 @@ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lam USES= imake motif USE_XORG= x11 xext xaw xmu xp xpm xt sm ice -PLIST_SUB+= RELEASE=${OSREL:R:R} ARCH=${ARCH} +PLIST_SUB+= RELEASE=${OSREL:R:R} ARCH=${ARCH} OPSYS=${OPSYS} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -LIBBINDIR= ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-FreeBSD_${OSREL:R:R}-${ARCH} +LIBBINDIR= ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH} post-extract: @${CHMOD} -R u+w ${WRKSRC} @@ -70,7 +70,7 @@ post-install: -e 's:${STAGEDIR}::' \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/discog/discog.html \ ${STAGEDIR}${PREFIX}/lib/X11/xmcd/config/config.sh \ - ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-FreeBSD_9-amd64/README + ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH}/README @${FIND} ${STAGEDIR} -name \*.bak -delete .include Added: head/audio/xmcd/files/patch-install.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xmcd/files/patch-install.sh Sat May 31 15:23:44 2014 (r355992) @@ -0,0 +1,20 @@ +--- install.sh.orig 2004-04-21 19:27:01.000000000 +0000 ++++ install.sh +@@ -625,7 +625,7 @@ if [ "$OS_SYS" = A/UX ] + then + # Apple A/UX + SHELL=/bin/ksh +-elif [ "$OS_SYS" = FreeBSD ] ++elif [ "$OS_SYS" = FreeBSD -o "$OS_SYS" = DragonFly ] + then + # FreeBSD + OS_REL_T=`echo "$OS_REL_T" | sed 's/\..*$//'` +@@ -1170,7 +1170,7 @@ make_dir $ARCHBIN $DIRPERM $OWNER $GROUP + make_dir $ARCHLIB $DIRPERM $OWNER $GROUP + make_dir $DISCOGDIR $GDIRPERM $OWNER $GROUP + +-if [ -n "$MANDIR" ] ++if [ -n "$MANDIR" -a ! -d "$MANDIR" ] + then + make_dir $MANDIR $DIRPERM $OWNER $GROUP + fi Modified: head/audio/xmcd/pkg-plist ============================================================================== --- head/audio/xmcd/pkg-plist Sat May 31 15:21:36 2014 (r355991) +++ head/audio/xmcd/pkg-plist Sat May 31 15:23:44 2014 (r355992) @@ -5,11 +5,11 @@ lib/X11/app-defaults/XMcd lib/X11/xmcd/app-defaults/XKeysymDB lib/X11/xmcd/app-defaults/XMcd lib/X11/xmcd/app-defaults/XMcd.sgi -lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/README -lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/cda -lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/gobrowser -lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/has_alsa -lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%%/xmcd +lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/README +lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/cda +lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/gobrowser +lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/has_alsa +lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%%/xmcd lib/X11/xmcd/config/.tbl/Acer lib/X11/xmcd/config/.tbl/Apple lib/X11/xmcd/config/.tbl/Aztech @@ -290,8 +290,8 @@ lib/X11/xmcd/scripts/genidx man/man1/cda.1.gz man/man1/xmcd.1.gz @dirrm lib/X11/xmcd/app-defaults -@dirrm lib/X11/xmcd/bin-FreeBSD_%%RELEASE%%-%%ARCH%% -@dirrmtry lib/X11/xmcd/lib-FreeBSD_%%RELEASE%%-%%ARCH%% +@dirrm lib/X11/xmcd/bin-%%OPSYS%%_%%RELEASE%%-%%ARCH%% +@dirrmtry lib/X11/xmcd/lib-%%OPSYS%%_%%RELEASE%%-%%ARCH%% @dirrm lib/X11/xmcd/config/.tbl @dirrm lib/X11/xmcd/config @dirrm lib/X11/xmcd/discog/Blues/General_Blues