- Update to 0.1.17

- Use OPTIONS
- Update WWW

Feature safe:	yes
This commit is contained in:
Emanuel Haupt 2009-09-20 13:00:08 +00:00
parent 62afb8b3bd
commit 4eabb45086
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=241817
6 changed files with 150 additions and 84 deletions

View File

@ -6,12 +6,10 @@
#
PORTNAME= ocp
PORTVERSION= 0.1.13
PORTREVISION= 7
PORTVERSION= 0.1.17
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://stian.lunafish.org/ocp/ \
CRITICAL
MASTER_SITES= CRITICAL
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= The legendary Open Cubic Player
@ -26,7 +24,7 @@ ONLY_FOR_ARCHS= i386
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
MAKE_JOBS_UNSAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@ -54,6 +52,11 @@ PFILES= configure cpiface/cpianal.c cpiface/cpidots.c \
stuff/poutput-dga.c stuff/poutput-keyboard.c \
stuff/poutput-vcsa.c stuff/poutput-x11.c
OPTIONS= ADPLUG "Build with adplug support" on \
FLAC "Build with FLAC support" on \
MIDI "Build with timidity support" on \
X11 "Build with X11 support" on
.include <bsd.port.pre.mk>
.if exists(${TIMIDITY_CFG}) || !defined(WITHOUT_MIDI)
@ -62,48 +65,43 @@ RUN_DEPENDS+= ${TIMIDITY_CFG}:${PORTSDIR}/audio/eawpats
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --without-x11
PLIST_SUB+= XORG="@comment "
.else
USE_XORG= xxf86dga xxf86vm
USE_XORG= xxf86dga xxf86vm xpm
CONFIGURE_ARGS+= --with-x11=yes
PLIST_SUB+= XORG=""
.endif
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --with-debug
.endif
.if defined(WITH_ADPLUG)
LIB_DEPENDS+= adplug-2.1:${PORTSDIR}/audio/libadplug
CONFIGURE_ARGS+= --without-x11 --with-adplug
CONFIGURE_ARGS+= --with-adplug
PLIST_SUB+= ADPLUG=""
.else
PLIST_SUB+= ADPLUG="@comment "
CONFIGURE_ARGS+= --without-adplug
.endif
.if defined(WITH_FLAC)
LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
CONFIGURE_ARGS+= --with-flac
PLIST_SUB+= FLAC=""
.else
PLIST_SUB+= FLAC="@comment "
CONFIGURE_ARGS+= --without-flac
.endif
.if defined(NOPORTDOCS)
MAKE_ENV+= DOCS="\#"
.endif
.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
LIB_DEPENDS+= ncursesw.5:${PORTSDIR}/devel/ncurses
.endif
pre-everything::
.if !exists(${TIMIDITY_CFG}) && !defined(WITHOUT_MIDI)
@${ECHO_MSG} ""
@${ECHO_MSG} "In order to be able to play MIDI files, audio/eawpats will be installed."
@${ECHO_MSG} "Define WITHOUT_MIDI if you do not want to install it."
@${ECHO_MSG} ""
.endif
.if !defined(WITHOUT_X11) && !defined(WITH_ADPLUG)
@${ECHO_MSG} ""
@${ECHO_MSG} "If you want to compile without X11 support, hit Ctrl-C right now and"
@${ECHO_MSG} "define WITHOUT_X11"
@${ECHO_MSG} ""
.endif
# Hangs on exit
.if defined(WITH_ADPLUG) && !defined(WITHOUT_X11)
@${ECHO_MSG} ""
@${ECHO_MSG} "Disabling X11 support. X11 and libadplug usage cannot yet peacefully"
@${ECHO_MSG} "coexist."
@${ECHO_MSG} ""
.endif
post-patch:
.if defined(WITH_DEBUG)
@${REINPLACE_CMD} -e 's|/\*\ \(#define\ LD_DEBUG\ 1\)\ \*/|\1|' \
@ -127,25 +125,4 @@ post-patch:
.endfor
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ocp ${PREFIX}/bin
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/ocp.pak ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/ocp.ini ${PREFIX}/etc/ocp.ini.default
.if !exists(${PREFIX}/etc/ocp.ini)
${INSTALL_DATA} ${WRKSRC}/ocp.ini ${PREFIX}/etc
.endif
${MKDIR} ${PREFIX}/lib/ocp
${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/ocp
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for f in AUTHORS BUGS CREDITS Changelog KEYBOARD_REMAPS SUID TODO
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
MD5 (ocp-0.1.13.tar.gz) = 52074c15a0ee43908276436d703fe5d8
SHA256 (ocp-0.1.13.tar.gz) = d75f7af686533c1098da4a7540abfe45c72c1df8943c67b1b14b6034b32662b7
SIZE (ocp-0.1.13.tar.gz) = 659769
MD5 (ocp-0.1.17.tar.gz) = bae0d84dd429104e30e380088c92bd02
SHA256 (ocp-0.1.17.tar.gz) = cf099f363acfe614a2bbf69f0b89916dec01998be8a81a114c0c4988b3114a1e
SIZE (ocp-0.1.17.tar.gz) = 802000

View File

@ -0,0 +1,40 @@
--- Makefile.in.orig 2009-06-27 12:15:43.000000000 +0200
+++ Makefile.in 2009-09-20 14:26:13.000000000 +0200
@@ -35,8 +35,8 @@
install: all
- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
+ $(DOCS)mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
+ $(DOCS)$(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
$(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/etc"
@@ -52,7 +52,7 @@
if ! test -z $(DIR_SUFFIX); then ln -sf "ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp"; fi
$(CP) ultrafix.sh "$(DESTDIR)$(BINDIR)/ultrafix.sh"
mkdir -p "$(DESTDIR)$(ULTRADIR)"
- $(MAKE) -C doc DESTDIR="$(DESTDIR)" install TOPDIR="../$(TOPDIR)"
+ $(DOCS)$(MAKE) -C doc DESTDIR="$(DESTDIR)" install TOPDIR="../$(TOPDIR)"
ifeq ($(HAVE_X11),1)
mkdir -p "$(DESTDIR)$(PREFIX)/share/applications" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/" "$(DESTDIR)$(SYSCONFDIR)/X11/wmconfig"
$(CP) desktop/opencubicplayer.desktop "$(DESTDIR)$(PREFIX)/share/applications"
@@ -143,7 +143,7 @@
$(MAKE) -C playxm TOPDIR=../$(TOPDIR)
$(MAKE) -C stuff TOPDIR=../$(TOPDIR)
$(MAKE) -C medialib TOPDIR=../$(TOPDIR)
- $(MAKE) -C doc TOPDIR="../$(TOPDIR)"
+ $(DOCS)$(MAKE) -C doc TOPDIR="../$(TOPDIR)"
ocp: boot/kickload.o
$(CC) $(LDFLAGS) -o $@ $^ -pthread @DL_LIBS@ @EFENCE_LIBS@ @DUMA_LIBS@
@@ -177,7 +177,7 @@
$(MAKE) -C playxm TOPDIR=../$(TOPDIR) clean
$(MAKE) -C stuff TOPDIR=../$(TOPDIR) clean
$(MAKE) -C medialib TOPDIR=../$(TOPDIR) clean
- $(MAKE) -C doc TOPDIR="../$(TOPDIR)" clean
+ $(DOCS)$(MAKE) -C doc TOPDIR="../$(TOPDIR)" clean
find . -name '*~' -exec rm {} ';'
rm -f ocp.hlp ocp *$(LIB_SUFFIX)
rm -f CPARCH.DAT

View File

@ -0,0 +1,17 @@
--- doc/texi/Makefile.orig 2009-09-20 14:30:44.000000000 +0200
+++ doc/texi/Makefile 2009-09-20 14:30:47.000000000 +0200
@@ -17,10 +17,10 @@
install: all
mkdir -p "$(DESTDIR)$(INFODIR)"
- $(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)"
- install-info --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" || true
- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
- $(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
+ #$(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)"
+ $(DOCS)install-info --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" || true
+ $(DOCS)mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
+ $(DOCS)$(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
uninstall:
install-info --delete --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz"
rm -f "$(DESTDIR)$(INFODIR)/ocp.info.gz"

View File

@ -10,4 +10,4 @@ In addition to legacy tracker formats such as mod, xm and s3m, Open
Cubic Player now also supports mp3, ogg and ay files and can be compiled
with libadplug support.
WWW: http://stian.lunafish.org/coding-ocp.php
WWW: http://stian.cubic.org/project-ocp.php

View File

@ -1,14 +1,29 @@
bin/ocp
@unexec if cmp -s %D/etc/ocp.ini %D/etc/ocp.ini.default; then rm -f %D/etc/ocp.ini; fi
etc/ocp.ini.default
@exec [ -f %B/ocp.ini ] || cp %B/%f %B/ocp.ini
lib/ocp/arctar.so
lib/ocp/arczip.so
lib/ocp/compat.so
lib/ocp/cphelper.so
lib/ocp/cphlpif.so
lib/ocp/cpiface.so
lib/ocp/devi.so
bin/ultrafix.sh
%%XORG%%etc/X11/wmconfig/opencubicplayer
lib/ocp/autoload/10-compat.so
lib/ocp/autoload/10-devi.so
lib/ocp/autoload/10-hardware.so
lib/ocp/autoload/10-mchasm.so
lib/ocp/autoload/10-mixclip.so
lib/ocp/autoload/10-sets.so
lib/ocp/autoload/11-framelock.so
lib/ocp/autoload/12-poutput.so
lib/ocp/autoload/15-keyhelp.so
lib/ocp/autoload/20-cphelper.so
lib/ocp/autoload/25-pfilesel.so
lib/ocp/autoload/30-arctar.so
lib/ocp/autoload/30-arczip.so
lib/ocp/autoload/30-aytype.so
lib/ocp/autoload/30-fstypes.so
lib/ocp/autoload/30-mcpbase.so
lib/ocp/autoload/30-playsid.so
lib/ocp/autoload/30-plrbase.so
lib/ocp/autoload/30-smpbase.so
lib/ocp/autoload/35-cpiface.so
lib/ocp/autoload/40-cphlpif.so
%%FLAC%%lib/ocp/autoload/30-flacptype.so
%%ADPLUG%%lib/ocp/autoload/30-opltype.so
lib/ocp/devpdisk.so
lib/ocp/devpnone.so
lib/ocp/devposs.so
@ -17,9 +32,6 @@ lib/ocp/devsoss.so
lib/ocp/devwmix.so
lib/ocp/devwmixf.so
lib/ocp/devwnone.so
lib/ocp/framelock.so
lib/ocp/fstypes.so
lib/ocp/hardware.so
lib/ocp/libocp.so
lib/ocp/load669.so
lib/ocp/loadams.so
@ -31,35 +43,55 @@ lib/ocp/loadptm.so
lib/ocp/loads3m.so
lib/ocp/loadult.so
lib/ocp/medialib.so
lib/ocp/mchasm.so
lib/ocp/mcpbase.so
lib/ocp/mixclip.so
%%ADPLUG%%lib/ocp/opltype.so
lib/ocp/pfilesel.so
lib/ocp/playay.so
lib/ocp/playgmd.so
lib/ocp/playgmi.so
lib/ocp/playit.so
lib/ocp/playmp2.so
lib/ocp/playogg.so
lib/ocp/aytype.so
lib/ocp/playay.so
%%ADPLUG%%lib/ocp/playopl.so
lib/ocp/playsid.so
lib/ocp/sidtype.so
lib/ocp/playwav.so
lib/ocp/playxm.so
lib/ocp/plrbase.so
lib/ocp/poutput.so
lib/ocp/sets.so
lib/ocp/smpbase.so
%%DATADIR%%/ocp.pak
%%FLAC%%lib/ocp/playflac.so
%%ADPLUG%%lib/ocp/playopl.so
%%XORG%%share/applications/opencubicplayer.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/KEYBOARD_REMAPS
%%PORTDOCS%%%%DOCSDIR%%/SUID
%%PORTDOCS%%%%DOCSDIR%%/TODO
@dirrm lib/ocp
@dirrm %%DATADIR%%
%%PORTDOCS%%%%DOCSDIR%%/html/configuration.html
%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
%%PORTDOCS%%%%DOCSDIR%%/html/fileselector.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/install.html
%%PORTDOCS%%%%DOCSDIR%%/html/mdz.html
%%PORTDOCS%%%%DOCSDIR%%/html/player.html
%%PORTDOCS%%%%DOCSDIR%%/html/plugin.html
%%PORTDOCS%%%%DOCSDIR%%/html/specialdrive.html
%%PORTDOCS%%%%DOCSDIR%%/html/starting.html
%%PORTDOCS%%%%DOCSDIR%%/html/support.html
%%PORTDOCS%%%%DOCSDIR%%/html/wap.html
%%XORG%%share/icons/hicolor/16x16/apps/opencubicplayer.xpm
%%XORG%%share/icons/hicolor/48x48/apps/opencubicplayer.xpm
%%DATADIR%%/data/ocp.hlp
%%DATADIR%%/etc/ocp.ini
@dirrm share/ocp/ultradir
@dirrm share/ocp/etc
@dirrm share/ocp/data
@dirrm share/ocp
%%XORG%%@dirrmtry share/icons/hicolor/48x48/apps
%%XORG%%@dirrmtry share/icons/hicolor/48x48
%%XORG%%@dirrmtry share/icons/hicolor/16x16/apps
%%XORG%%@dirrmtry share/icons/hicolor/16x16
%%XORG%%@dirrmtry share/icons/hicolor
%%XORG%%@dirrmtry share/icons
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%XORG%%@dirrmtry share/applications
@dirrm lib/ocp/autoload
@dirrm lib/ocp
%%XORG%%@dirrm etc/X11/wmconfig
%%XORG%%@dirrmtry etc/X11