synch goggles to the fox update.

took me forever to remember that goggles starts up at the previous
bookmark, which was broken on the dvd I was testing.

Also, clean up the startup script while I'm there...
This commit is contained in:
espie 2007-02-27 11:15:25 +00:00
parent 5f6c216aae
commit 54363e1e66
5 changed files with 95 additions and 77 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.7 2007/01/12 08:48:57 steven Exp $
# $OpenBSD: Makefile,v 1.8 2007/02/27 11:15:25 espie Exp $
COMMENT='gui for ogle'
CATEGORIES=x11
COMMENT= 'gui for ogle'
CATEGORIES= x11
DISTNAME=goggles-0.8.0
PKGNAME=${DISTNAME}p0
EXTRACT_SUFX=.tar.bz2
MASTER_SITES=http://www.fifthplanet.net/files/
HOMEPAGE=http://www.fifthplanet.net/goggles.html
MAINTAINER=Marc Espie <espie@openbsd.org>
DISTNAME= goggles-0.9.1
PKGNAME= ${DISTNAME}
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= http://www.fifthplanet.net/files/
HOMEPAGE= http://www.fifthplanet.net/goggles.html
MAINTAINER= Marc Espie <espie@openbsd.org>
CONFIGURE_STYLE=simple
CONFIGURE_SCRIPT=/bin/sh ${WRKDIST}/gb
@ -16,34 +16,38 @@ CONFIGURE_ARGS+=--fox-prefix=${LOCALBASE} \
--ogle-prefix=${LOCALBASE} \
--use-config=${FILESDIR}/config.local \
--prefix=${LOCALBASE}
WRKCONF=${WRKDIST}
WRKSRC=${WRKDIST}/src
MAKE_FILE=build.mk
WRKCONF= ${WRKDIST}
WRKSRC= ${WRKDIST}
MAKE_FILE= gb.make
ALL_TARGET=
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_ENV=LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} LP64_ARCHS="${LP64_ARCHS}"
LIB_DEPENDS=FOX-1.4::devel/fox \
dvdcontrol,msgevents::x11/ogle
MAKE_FLAGS=-f ${WRKCONF}/conf.mk
LIB_DEPENDS= FOX-1.6:fox->=1.6:devel/fox \
dvdcontrol,msgevents::x11/ogle
WANTLIB= GL GLU X11 Xext Xcursor Xrandr bz2 c jpeg \
m png pthread stdc++ tiff z
MAKE_FLAGS= -f ${WRKCONF}/conf.mk
post-build:
cd ${WRKDIST} && sed -e 's,@prefix@/bin,${LOCALBASE}/libexec,' scripts/goggles.in >scripts/goggles
@echo '#! /bin/sh' >${WRKDIST}/scripts/goggles
@echo 'DVDP_UI=${PREFIX}/libexec/goggles exec ${LOCALBASE}/bin/ogle "$@"' >>${WRKDIST}/scripts/goggles
DOCDIR=${PREFIX}/share/doc/goggles
DOCDIR= ${PREFIX}/share/doc/goggles
do-install:
${INSTALL_SCRIPT} ${WRKDIST}/scripts/goggles ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/ogle_gui_goggles ${PREFIX}/libexec
${INSTALL_PROGRAM} ${WRKDIST}/src/goggles ${PREFIX}/libexec
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKDIST}/desktop/goggles_manual.pdf ${DOCDIR}
# GPL
PERMIT_DISTFILES_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_PACKAGE_CDROM=Yes
WANTLIB=GL GLU X11 Xext Xcursor Xrandr bz2 c jpeg m png pthread stdc++ tiff z
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
.include <bsd.port.mk>

View File

@ -1,4 +1,5 @@
MD5 (goggles-0.8.0.tar.bz2) = 3f459949fd05a3010a7a0752f403bdbe
RMD160 (goggles-0.8.0.tar.bz2) = d258ca8ac30b67468b6c5db9ff44588739e04525
SHA1 (goggles-0.8.0.tar.bz2) = a677d141c2026038819255109d21b3c3f4264a5d
SIZE (goggles-0.8.0.tar.bz2) = 490077
MD5 (goggles-0.9.1.tar.bz2) = f907442fd382c6331d1181e257c8b882
RMD160 (goggles-0.9.1.tar.bz2) = 6a15a365b1b4bfaba1b6d294d2e7379b4f0fb560
SHA1 (goggles-0.9.1.tar.bz2) = 2e464e1bcf699a18f6190f5571877356388c778a
SHA256 (goggles-0.9.1.tar.bz2) = d2c14b9bd6c547021f3d77e998d673510a48051ee39417a858380cb17a000d1a
SIZE (goggles-0.9.1.tar.bz2) = 486290

View File

@ -1,39 +1,11 @@
# Search and Installation Directories
#-------------------------------------------------------------------------------
MENU_FILE_DIR="${LOCALBASE}/share/applications"
MENU_ICON_DIR="${LOCALBASE}/share/icons"
MENU_LINK_DIR="${LOCALBASE}/share/applnk-mdk/Multimedia/Video"
# Device
#-------------------------------------------------------------------------------
CONFIG_DVD_DEVICE="/dev/dvd"
# Possible defaults for other platforms.
#CONFIG_DVD_DEVICE="/cdrom/cdrom0" # Solaris
#CONFIG_DVD_DEVICE="/dev/acd0c" # FreeBSD
#CONFIG_DVD_DEVICE="/dev/rcd0d" # NetBSD (Intel x86)
#CONFIG_DVD_DEVICE="/dev/rcd0c" # NetBSD
#CONFIG_DVD_DEVICE="/dev/rcd0c" # OpenBSD
#CONFIG_DVD_DEVICE="/dev/sr0c" # BSDi
# 64 bit Programming Model
#----------------------------------------------------------------------------------------------------------------
CONFIG_LP64=0
for i in ${LP64_ARCHS}
do
test $i = $OSMACHINE && CONFIG_LP64=1
done
CONFIG_LLP64=0
CONFIG_ILP64=0
#----------------------------------------------------------------------------------------------------------------
# Basic File extensions
export BINEXT="" # Executable Extension
export LIBEXT=".a" # Static Library Extension
export DLLEXT=".so.0.0" # Dynamic Library Extension
export DLLEXT=".so" # Dynamic Library Extension
export OBJEXT=".o" # Object Extension
export LIBPREFIX="lib" # Standard Library Prefix
export LIBDIR="lib" # Name of the library directory
# Compiler and Linker
export CC="gcc" # C Compiler
@ -48,12 +20,46 @@ export OUTPUTOBJ="-o" # Compiler flag to specify output object f
export OUTPUTBIN="-o " # Compiler flag to specify output executable filename
export PICFLAG="" # Compiler flag to generate position independent code
# General Linker Flags (probably need to distinguish between Libs and Executables.
export LDFLAGS=""
if [ $DEFS == "-DDEBUG" ] ; then
export CFLAGS="${CFLAGS:--Wall -g -pipe }"
export CXXFLAGS="${CXXFLAGS:--Wall -g -pipe}"
export LDFLAGS=""
elif [ $DEFS == "-DNDEBUG" ] ; then
export CFLAGS="${CFLAGS:--Wall -O3 -pipe}"
export CXXFLAGS="${CXXFLAGS:--Wall -O3 -pipe}"
export LDFLAGS="-s"
else
export CFLAGS="${CFLAGS:--Wall -pipe}"
export CXXFLAGS="${CXXFLAGS:--Wall -pipe}"
export LDFLAGS=""
fi
export CFLAGS="${CFLAGS:--Wall -O2}"
export CXXFLAGS="${CXXFLAGS:--Wall -O2}"
export CPPFLAGS="-I../include -I${X11BASE}/include ${CPPFLAGS}"
export CPPFLAGS="-I./include -I${LOCALBASE}/include -I${X11BASE}/include ${CPPFLAGS}"
export LIBS=""
export DEFS="-DLINUX"
export DEFS="${DEFS}"
#----------------------------------------------------------------------------------------------------------------

View File

@ -1,22 +1,29 @@
$OpenBSD: patch-gb,v 1.1 2005/05/07 11:53:04 espie Exp $
--- gb.orig Fri Mar 18 06:43:25 2005
+++ gb Sat May 7 13:13:30 2005
@@ -30,7 +30,7 @@ INSTALL=${INSTALL:-install}
$OpenBSD: patch-gb,v 1.2 2007/02/27 11:15:25 espie Exp $
--- gb.orig Sun Nov 26 23:19:18 2006
+++ gb Wed Feb 7 03:30:24 2007
@@ -12,6 +12,7 @@
#
#-----------------------------------------------------------
+PATH=.:$PATH
#Setup Package Name and Version
. gb.version
@@ -65,7 +66,7 @@ INSTALL=${INSTALL:-install}
#Get the settings
. "$CONFIG_FILE"
-function print_help() {
+function print_help {
SHOWHELP=1
echo "Options:"
echo " "
echo -e " \033[32m$0\033[0m \033[1mBuild Goggles\033[0m"
@@ -143,6 +143,9 @@ echo -e " \033[32mDefines\0
echo -e " \033[32mLibraries\033[0m: \033[1m$LIBS\033[0m"
echo " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "
@@ -179,6 +180,8 @@ done
#fi
+
+printenv >conf.mk
+exit 0
#Do Make
#Remove Target
# Did we already build?
${MAKE} -q -f gb.make
if [ "$?" -eq "0" ] ; then

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2005/05/07 11:53:04 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2007/02/27 11:15:25 espie Exp $
bin/goggles
libexec/ogle_gui_goggles
libexec/goggles
share/doc/goggles/
share/doc/goggles/goggles_manual.pdf