Date: Tue, 25 Nov 2003 14:30:56 +0100 (CET) From: Simun Mikecin <sime@logos.hr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59681: [patch] games/HeroesOfMightAndMagic install broken Message-ID: <20031125133056.913E71CCBA@mail.logos.hr> Resent-Message-ID: <200311251340.hAPDe7FI099450@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59681
>Category: ports
>Synopsis: [patch] games/HeroesOfMightAndMagic install broken
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 25 05:40:07 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Simun Mikecin
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD mail.logos.hr 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Nov 17 13:36:42 CEST 2003 root@mail.logos.hr:/usr/obj/usr/src/sys/MAIL i386
>Description:
'make install' doesn't work with recent ports collection. This is
because package file list is generated in install script, which is
invalid.
>How-To-Repeat:
Try 'make install' in /usr/ports/games/HeroesOfMightAndMagic
>Fix:
--- HeroesOfMightAndMagic.patch begins here ---
diff -u -r /usr/ports/games/HeroesOfMightAndMagic/scripts/configure HeroesOfMightAndMagic/scripts/configure
--- /usr/ports/games/HeroesOfMightAndMagic/scripts/configure Wed Mar 7 12:35:58 2001
+++ HeroesOfMightAndMagic/scripts/configure Thu Nov 13 21:37:23 2003
@@ -53,4 +53,39 @@
yesno NO "Do you want to install Videos (137 MB) "
echo VIDEOS=$answ >> $F
+. $F
+
+cat ${PKGDIR}/files/pkg-plist.base > ${PLIST}
+
+# Scenario files
+if [ $SCENARIO = YES ]; then
+ cat ${PKGDIR}/files/pkg-plist.scenario >> ${PLIST}
+else
+ echo ${GAMESUBDIR}/maps >> ${PLIST}
+fi
+
+# Neither sound nor Music, make the whole data tree a link
+if [ $GRAPHIC = NO -a $MUSIC = NO ]; then
+ echo ${GAMESUBDIR}/data/video >> ${PLIST}
+else
+ cat ${PKGDIR}/files/pkg-plist.video >> ${PLIST}
+fi
+
+# Videos
+if [ $VIDEOS = YES ]; then
+ cat ${PKGDIR}/files/pkg-plist.video >> ${PLIST}
+fi
+
+
+
+# Music
+if [ $MUSIC = YES ]; then
+ cat ${PKGDIR}/files/pkg-plist.music >> ${PLIST}
+else
+ echo ${GAMESUBDIR}/mp3 >> ${PLIST}
+fi
+
+echo @dirrm ${GAMESUBDIR}/data >> ${PLIST}
+echo @dirrm ${GAMESUBDIR} >> ${PLIST}
+
exit 0
diff -u -r /usr/ports/games/HeroesOfMightAndMagic/scripts/do-install HeroesOfMightAndMagic/scripts/do-install
--- /usr/ports/games/HeroesOfMightAndMagic/scripts/do-install Wed Mar 7 12:35:58 2001
+++ HeroesOfMightAndMagic/scripts/do-install Thu Nov 13 21:41:11 2003
@@ -21,11 +21,11 @@
# INSTALL_PROGRAM (its parameter -s) currupts the file. Using cp.
cp ${CD}/bin/x86/heroes3 ${GAMEDIR}
+chmod 755 ${GAMEDIR}/heroes3
brandelf -t Linux ${GAMEDIR}/heroes3
ln -sf ${GAMEDIR}/heroes3 ${LOCALBASE}/bin/heroes3
touch ${GAMEDIR}/data/hiscore.dat
chmod 666 ${GAMEDIR}/data/hiscore.dat
-cat ${PKGDIR}/files/pkg-plist.base > ${PLIST}
# Basis packet
if [ $BASIC = YES ]; then
@@ -43,18 +43,13 @@
echo Installing Scenarios
mkdir -p ${GAMEDIR}/maps
${INSTALL_DATA} ${CD}/maps/* ${GAMEDIR}/maps
- cat ${PKGDIR}/files/pkg-plist.scenario >> ${PLIST}
else
ln -sf ${CD}/maps ${GAMEDIR}/maps
- echo ${GAMESUBDIR}/maps >> ${PLIST}
fi
# Neither sound nor Music, make the whole data tree a link
if [ $GRAPHIC = NO -a $MUSIC = NO ]; then
ln -sf ${CD}/data/video ${GAMEDIR}/data/video
- echo ${GAMESUBDIR}/data/video >> ${PLIST}
-else
- cat ${PKGDIR}/files/pkg-plist.video >> ${PLIST}
fi
# Graphics (recommended)
@@ -77,7 +72,6 @@
echo Installing Videos
mkdir -p ${GAMEDIR}/data/video
${INSTALL_DATA} ${CD}/data/video/*.mpg ${GAMEDIR}/data/video
- cat ${PKGDIR}/files/pkg-plist.video >> ${PLIST}
elif [ $GRAPHIC = YES ]; then
# Music is installed, so create links
cd $CD/data/video
@@ -92,14 +86,9 @@
echo Installing Music
mkdir -p ${GAMEDIR}/mp3
${INSTALL_DATA} ${CD}/mp3/* ${GAMEDIR}/mp3
- cat ${PKGDIR}/files/pkg-plist.music >> ${PLIST}
else
ln -sf ${CD}/mp3 ${GAMEDIR}/mp3
- echo ${GAMESUBDIR}/mp3 >> ${PLIST}
fi
-
- echo @dirrm ${GAMESUBDIR}/data >> ${PLIST}
- echo @dirrm ${GAMESUBDIR} >> ${PLIST}
# Goodbye message
if [ $BASIC = YES -a $GRAPHIC = YES ]; then
--- HeroesOfMightAndMagic.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031125133056.913E71CCBA>