Bug 26184

Summary: Fix port dependency for /usr/ports/games/hlserver-flf
Product: Ports & Packages Reporter: pat <pat>
Component: Individual Port(s)Assignee: Mario Sergio Fujikawa Ferreira <lioux>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description pat 2001-03-28 22:20:01 UTC
Fix depend object error in http://people.freebsd.org/~fenner/errorlogs/pat@databits.net.html

How-To-Repeat: 
N/A
Comment 1 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-03-28 22:51:08 UTC
I'd suggest this port using USE_LINUX instead of hardcoding
PREFIX/DEPENDS on /compat/linux stuff. And, add #empty comment to
EXTRACT_ONLY to specify readers understand this is not error.

Please test this, as I don't have enough Net link to fetch several
hundreds MB of tarballs.

Index: hlserver-cs/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/hlserver-cs/Makefile,v
retrieving revision 1.2
diff -u -u -2 -r1.2 Makefile
--- hlserver-cs/Makefile	2001/03/24 20:30:46	1.2
+++ hlserver-cs/Makefile	2001/03/28 21:44:19
@@ -13,15 +13,14 @@
 		http://flf.playnet.com/
 DISTNAME=	cs_11b_full
-EXTRACT_ONLY=	
+EXTRACT_ONLY=	#empty
 
 MAINTAINER=	pat@databits.net
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \
-		hlds_l:${PORTSDIR}/games/halflifeserver
+DEPENDS=	${PORTSDIR}/games/halflifeserver
 
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
-PREFIX=		/compat/linux
+
+USE_LINUX=	yes
 WRKSRC=		${WRKDIR}/hlds_l
 EXTRACT_ONLY_1=	cs_11b_full.tar.gz
Index: hlserver-flf/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/hlserver-flf/Makefile,v
retrieving revision 1.2
diff -u -u -2 -r1.2 Makefile
--- hlserver-flf/Makefile	2001/03/24 20:30:46	1.2
+++ hlserver-flf/Makefile	2001/03/28 21:44:29
@@ -13,15 +13,14 @@
 		ftp://ftp.task.gda.pl/vol/d33/ftp.extreme-players.de/exp/hl/mod/frontlineforce/
 DISTNAME=	frontline_linux_1.2
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#empty
 
 MAINTAINER=	pat@databits.net
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \
-		hlds_l:${PORTSDIR}/games/halflifeserver
+DEPENDS=	${PORTSDIR}/games/halflifeserver
 
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
-PREFIX=		/compat/linux
+
+USE_LINUX=	yes
 WRKSRC=		${WRKDIR}/hlds_l
 EXTRACT_ONLY_1=	frontline_linux_1.2.tar.gz
Comment 2 Mario Sergio Fujikawa Ferreira freebsd_committer freebsd_triage 2001-03-29 11:10:52 UTC
Responsible Changed
From-To: freebsd-ports->lioux

I am already handling these with the maintainer.
Comment 3 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-03-29 13:03:49 UTC
Oops, I meant USE_LINUX_PREFIX rather than USE_LINUX.
USE_LINUX_PREFIX impiles USE_LINUX=yes and PREFIX?=/compat/linux.
It should work as it used to be.

-- 
FUJISHIMA Satsuki

At Wed, 28 Mar 2001 17:56:13 -0500,
Patrick Li wrote:
> 
> ok i tested it and got:
> 
> bottlenek# make install
> >> frontline_linux_1.2.tar.gz doesn't seem to exist in
> /usr/ports/distfiles/.
> >> Attempting to fetch from http://hex.databits.net/~pat/.
> Receiving frontline_linux_1.2.tar.gz (59891756 bytes): 100%
> 59891756 bytes transferred in 1473.5 seconds (39.69 kBps)
> ===>  Extracting for FLF-1.2
> >> Checksum OK for frontline_linux_1.2.tar.gz.
> ===>   FLF-1.2 depends on: /usr/ports/games/halflifeserver
> ===>    Verifying install for /usr/ports/games/halflifeserver
> ===>  Extracting for HLDS-3.1.0.6
> >> Checksum OK for hlds_l3106.tar.gz.
> ===>   HLDS-3.1.0.6 depends on file: /compat/linux/lib/ld.so - found
> ===>  Patching for HLDS-3.1.0.6
> ===>  Configuring for HLDS-3.1.0.6
> ===>  Installing for HLDS-3.1.0.6
> ===>   HLDS-3.1.0.6 depends on file:
> /compat/linux/usr/i486-linux-libc5/lib/libc
> .so.5 - found
> if ! (cat /compat/linux/etc/ld.so.conf | /usr/bin/grep /usr/games/hlds_l) ;
> then
>   echo /usr/games/hlds_l >> /compat/linux/etc/ld.so.conf ; fi
> /compat/linux/bin/sh -c /sbin/ldconfig
> ===>   Generating temporary packing list
> ===>   Registering installation for HLDS-3.1.0.6
> ===>   Returning to build of FLF-1.2
> ===>  Patching for FLF-1.2
> ===>  Configuring for FLF-1.2
> ===>  Installing for FLF-1.2
> ===>   FLF-1.2 depends on file: /compat/linux/etc/redhat-release - found
> cd: can't cd to /usr/local/usr/games/hlds_l
> *** Error code 2
> 
> Stop in /usr/ports/games/hlserver-flf.
> *** Error code 1
> 
> Stop in /usr/ports/games/hlserver-flf.
> *** Error code 1
> 
> Stop in /usr/ports/games/hlserver-flf.
> 
> this port installs in /compat/linux/usr/games/hlds_l and removing prefix
> /compat/linux will break it.
> 
> Thanks,
> 
> Patrick Li < pat@databits.net >
Comment 4 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-03-31 13:11:58 UTC
Hi, finally I've done the test successfully(this means I've done to
retrieve 233MB of distfiles :). Changes from -current in CVS are
following:
o change MASTER_SITES based on Patrick's.
o specify RUN_DEPENDS on ${PREFIX}${HLDSDIR}/hlds_run instead of
  hlds_l, the reason of this port failed previously at bento is,
  -- RUN_DEPENDS searches excutable within $PATH or file specified
  within full path. So DEPENDS is not necessary, RUN_DEPENDS on
  full_path_to_excutable is enough. 
o USE_LINUX_PREFIX.

At Thu, 29 Mar 2001 12:16:53 -0500 (EST),
Patrick Li wrote:
> 
> ok will do. once i'm done testing it with the USE_LINUX_PREFIX, would you
> like me to send you the diffs so you can review and commit them?

lioux@ claims his responsibility of your PR's and I think he'll commit
them for you. As I have working patches now, I don't mind to commit it
if you and he approves me. :-)

-- 
FUJISHIMA Satsuki

Index: halflifeserver/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/halflifeserver/Makefile,v
retrieving revision 1.8
diff -u -u -2 -r1.8 Makefile
--- halflifeserver/Makefile	2001/03/24 20:30:44	1.8
+++ halflifeserver/Makefile	2001/03/29 11:47:49
@@ -9,6 +9,5 @@
 PORTVERSION=	3.1.0.6
 CATEGORIES=	games linux
-MASTER_SITES=	http://hex.databits.net/~pat/ \
-		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/ \
+MASTER_SITES=	http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/official/ \
 		http://www.jetstreamgames.co.nz/files/pub/gamespyftp1/fpnew/action/half-life/official/ \
 		ftp://ftp.fasta.fh-dortmund.de/gdi/halflife/server/linux/ \
@@ -17,14 +16,11 @@
 		ftp://ftp.icsmedia.de/pub/games/halflife/hl_server/
 DISTNAME=	hlds_l3106
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#empty
 
 MAINTAINER=	pat@databits.net
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
-
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
-PREFIX=		/compat/linux
+USE_LINUX_PREFIX=	yes
 WRKSRC=		${WRKDIR}/hlds_l
 EXTRACT_ONLY_1=	hlds_l3106.tar.gz
Index: hlserver-cs/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/hlserver-cs/Makefile,v
retrieving revision 1.2
diff -u -u -2 -r1.2 Makefile
--- hlserver-cs/Makefile	2001/03/24 20:30:46	1.2
+++ hlserver-cs/Makefile	2001/03/31 11:41:23
@@ -9,19 +9,18 @@
 PORTVERSION=	1.1b
 CATEGORIES=	games linux
-MASTER_SITES=	http://hex.databits.net/~pat/ \
-		ftp://ftp.icrontic.com/pub/ \
-		http://flf.playnet.com/
+MASTER_SITES=	ftp://ftp.icrontic.com/pub/ \
+		http://flf.playnet.com/ \
+		http://www.death-match.com/fr/download/fichiers/halflife/mods/ \
+		ftp://ftp.lexicon.net/games/half-life/cstrike/linux/
 DISTNAME=	cs_11b_full
-EXTRACT_ONLY=	
+EXTRACT_ONLY=	#empty
 
 MAINTAINER=	pat@databits.net
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \
-		hlds_l:${PORTSDIR}/games/halflifeserver
+RUN_DEPENDS=	${PREFIX}${HLDSDIR}/hlds_run:${PORTSDIR}/games/halflifeserver
 
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
-PREFIX=		/compat/linux
+USE_LINUX_PREFIX=	yes
 WRKSRC=		${WRKDIR}/hlds_l
 EXTRACT_ONLY_1=	cs_11b_full.tar.gz
Index: hlserver-flf/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/hlserver-flf/Makefile,v
retrieving revision 1.2
diff -u -u -2 -r1.2 Makefile
--- hlserver-flf/Makefile	2001/03/24 20:30:46	1.2
+++ hlserver-flf/Makefile	2001/03/31 11:41:34
@@ -9,19 +9,22 @@
 PORTVERSION=	1.2
 CATEGORIES=	games linux
-MASTER_SITES=	http://hex.databits.net/~pat/ \
+MASTER_SITES=	http://www.thekillinggrounds.com/downloads/ \
+		http://ftp2.gamespy.com/pub/cdrom/planethalflife/frontline/ \
+		http://ftp1download.gamespy.com/fileplanet/fpnew/action/half-life/modifications/frontlineforce/ \
+		http://www.hhole.com/ \
+		http://www.spies.com/flf/downloads/ \
 		ftp://ftp.icrontic.com/pub/ \
-		ftp://ftp.task.gda.pl/vol/d33/ftp.extreme-players.de/exp/hl/mod/frontlineforce/
+		ftp://ftp.task.gda.pl/vol/d33/ftp.extreme-players.de/exp/hl/mod/frontlineforce/ \
+		http://www.patchez.de/files/
 DISTNAME=	frontline_linux_1.2
-EXTRACT_ONLY=
+EXTRACT_ONLY=	#empty
 
 MAINTAINER=	pat@databits.net
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base
-RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \
-		hlds_l:${PORTSDIR}/games/halflifeserver
+RUN_DEPENDS=	${PREFIX}${HLDSDIR}/hlds_run:${PORTSDIR}/games/halflifeserver
 
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
-PREFIX=		/compat/linux
+USE_LINUX_PREFIX=	yes
 WRKSRC=		${WRKDIR}/hlds_l
 EXTRACT_ONLY_1=	frontline_linux_1.2.tar.gz
Comment 5 Mario Sergio Fujikawa Ferreira freebsd_committer freebsd_triage 2001-04-10 12:18:28 UTC
State Changed
From-To: open->closed

Committed with lots of changes, thanks! :)