mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

audio/xmcd: Unbreak on !amd64, support DragonFly

Browse Source 
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.
This commit is contained in:
John Marino 2014-05-31 15:23:44 +00:00
parent bbde51b6ec
commit c46f0e966e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355992
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/xmcd/Makefile
View File

@ -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/lame
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 <bsd.port.mk>

11
audio/xmcd/files/patch-ag
View File

@ -1,11 +0,0 @@
--- install.sh.orig Mon Nov 4 05:17:09 2002
+++ install.sh Mon Nov 4 05:16:44 2002
@@ -1120,7 +1120,7 @@
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

20
audio/xmcd/files/patch-install.sh Normal file
View File

@ -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

14
audio/xmcd/pkg-plist
View File

@ -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