ports/75040: Patch port: multimedia/goggles fix install

[Serge Gagnon]

>Number:         75040
>Category:       ports
>Synopsis:       Patch port: multimedia/goggles fix install
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 14 04:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Serge Gagnon
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Thu Dec 2 14:23:49 EST 2004 root at quenix1.dyndns.org:/usr/obj/usr/src/sys/OCEAN i386

>Description:
	o Fix install problem
	In fact, it was not an install problem, but a build problem.
	The program was unable to install an executable that was
	never built.
	It seems that we do not have -mtune flag in g++ on FreeBSD 4.

	Just replace the ${FILESDIR}/patch-build-config.linux by
	the one below.

	Btw, this little app seems to be cool ;)

>How-To-Repeat:
>Fix:


--- patch-build-config.linux begins here ---
--- build/config.linux.orig	Tue Nov  2 00:32:38 2004
+++ build/config.linux	Mon Dec 13 23:22:19 2004
@@ -2,7 +2,7 @@
 #-------------------------------------------------------------------------------
 CONFIG_XV=${CONFIG_XV:-1}
 CONFIG_DXR3=${CONFIG_DXR3:-0}
-CONFIG_DVD_DEVICE="/dev/dvd"
+CONFIG_DVD_DEVICE="%%DVDDEVICE%%"
 
 # Possible defaults for other platforms.
 #CONFIG_DVD_DEVICE="/cdrom/cdrom0"                      # Solaris
@@ -15,13 +15,13 @@
 
 # Search and Installation Directories
 #-------------------------------------------------------------------------------
-FOX_PREFIX="${FOX_PREFIX:-/usr}"
-OGLE_PREFIX="${OGLE_PREFIX:-/usr}"
-GOGGLES_PREFIX="${GOGGLES_PREFIX:-/usr}"
-XLIB_PREFIX="/usr/X11R6"
-MENU_FILE_DIR="/usr/share/applications"
-MENU_ICON_DIR="/usr/share/icons"
-MENU_LINK_DIR="/usr/share/applnk-mdk/Multimedia/Video"
+FOX_PREFIX="%%LOCALBASE%%"
+OGLE_PREFIX="%%LOCALBASE%%"
+GOGGLES_PREFIX="%%PREFIX%%"
+XLIB_PREFIX="%%X11BASE%%"
+MENU_FILE_DIR="%%PREFIX%%/share/gnome/applications"
+MENU_ICON_DIR="%%PREFIX%%/share/icons"
+MENU_LINK_DIR="%%PREFIX%%/share/applnk-mdk/Multimedia/Video"
 
 # Libraries we need
 #----------------------------------------------------------------------------------------------------------------
@@ -89,10 +89,10 @@
 # General Linker Flags (probably need to distinguish between Libs and Executables.
 export LDFLAGS=""
 
-export CFLAGS="-Wall -O2 -march=i586 -mtune=i586"
-export CXXFLAGS="-Wall -O2 -march=i586 -mtune=i586"
-export CPPFLAGS="-I../include $OGLE_INCLUDE $FOX_INCLUDE"
-export LIBS="$OGLE_LIB $XV_LIBS $FOX_LIB"
+export CFLAGS="-Wall -O2 -march=i586"
+export CXXFLAGS="-Wall -O2 -march=i586"
+export CPPFLAGS="-I../include $OGLE_INCLUDE $FOX_INCLUDE -I%%X11BASE%%/include"
+export LIBS="$OGLE_LIB $XV_LIBS $FOX_LIB %%PTHREADLIBS%%"
 export DEFS="-DLINUX $DXR3_DEFS $XV_DEFS"
 #----------------------------------------------------------------------------------------------------------------
 
--- patch-build-config.linux ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: