aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2008-06-23 11:33:24 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2008-06-23 11:33:24 +0000
commitb16fd44c3c6916ceb4b612173ad36f5bc5178006 (patch)
tree9313e9055f62eb65d331db7170c809a8546aa960
parent40f287540ce63a6e101c2fd845b6fbb3ab3bf667 (diff)
downloadports-b16fd44c3c6916ceb4b612173ad36f5bc5178006.tar.gz
ports-b16fd44c3c6916ceb4b612173ad36f5bc5178006.zip
Notes
-rw-r--r--audio/ocp/Makefile67
-rw-r--r--audio/ocp/distinfo6
-rw-r--r--audio/ocp/pkg-plist15
3 files changed, 41 insertions, 47 deletions
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index ccdc3f7cded0..c20ddd3b311b 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -6,32 +6,26 @@
#
PORTNAME= ocp
-PORTVERSION= 0.1.15
+PORTVERSION= 0.1.13
+PORTREVISION= 6
+PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://stian.lunafish.org/ocp/ \
CRITICAL
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ehaupt@FreeBSD.org
COMMENT= The legendary Open Cubic Player
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
- id3tag.0:${PORTSDIR}/audio/libid3tag \
+LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \
mad.2:${PORTSDIR}/audio/libmad \
- sidplay.1:${PORTSDIR}/audio/libsidplay \
- vorbis.4:${PORTSDIR}/audio/libvorbis
+ vorbis.4:${PORTSDIR}/audio/libvorbis \
+ sidplay.1:${PORTSDIR}/audio/libsidplay
ONLY_FOR_ARCHS= i386
-USE_GNOME= gnometarget
-USE_ICONV= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
- CPPFLAGS="${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-dir-suffix="" \
- --libdir=${LOCALBASE}/lib
+USE_GMAKE= yes
+USE_GCC= 3.4+
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -39,16 +33,25 @@ LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -L${LOCALBASE}/lib
CXXFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+
+CONFIGURE_ARGS= --with-dir-suffix="" \
+ --libdir=${LOCALBASE}/lib
+
TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg
PFILES= configure cpiface/cpianal.c cpiface/cpidots.c \
cpiface/cpiface.c cpiface/cpigraph.c cpiface/cpiinst.c \
- cpiface/cpikeyhelp.c cpiface/cpikube.c cpiface/cpilinks.c \
- cpiface/cpimsg.c cpiface/cpiphase.c cpiface/cpiscope.c \
- cpiface/cpitrack.c cpiface/mcpedit.c cpiface/volctrl.c \
- filesel/cphlpfs.c filesel/pfilesel.c help/cphelper.c \
- medialib/medialib.c playcda/cdapplay.c stuff/console.c \
- stuff/poutput-curses.c stuff/poutput-keyboard.c \
+ cpiface/cpikube.c cpiface/cpilinks.c cpiface/cpimsg.c \
+ cpiface/cpiphase.c cpiface/cpiscope.c cpiface/cpitrack.c \
+ cpiface/mcpedit.c cpiface/volctrl.c filesel/cphlpfs.c \
+ filesel/pfilesel.c filesel/pfilesel.c.bak help/cphelper.c \
+ medialib/medialib.c playcda/cdapplay.c stuff/poutput-curses.c \
+ stuff/poutput-dga.c stuff/poutput-keyboard.c \
stuff/poutput-vcsa.c stuff/poutput-x11.c
.include <bsd.port.pre.mk>
@@ -102,15 +105,17 @@ pre-everything::
.endif
post-patch:
- @${REINPLACE_CMD} -e '/^if test/s|==|=|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
- ${WRKSRC}/playgmi/gmitimidity.c
-
.if defined(WITH_DEBUG)
@${REINPLACE_CMD} -e 's|/\*\ \(#define\ LD_DEBUG\ 1\)\ \*/|\1|' \
${WRKSRC}/config.h.in
.endif
+ @${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|' ${WRKSRC}/types.h
+ @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
+ ${WRKSRC}/playgmi/gmitimidity.c
+# conflicts with fnmatch.h from security/heimdal
+ @${REINPLACE_CMD} -e 's|<\(fnmatch.h\)>|"/usr/include/\1"|' \
+ ${WRKSRC}/filesel/adb.c \
+ ${WRKSRC}/filesel/pfilesel.c
.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
# use ncursesw from ports
@@ -134,15 +139,7 @@ do-install:
.endif
${MKDIR} ${PREFIX}/lib/ocp
-.for d in . cpiface dev devp devs devw filesel help medialib playay playflac \
- playgmd playgmi playit playmp2 playogg playsid playwav playxm stuff
- ${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp
-.endfor
-.if defined(WITH_ADPLUG)
-.for d in playopl
- ${INSTALL_DATA} ${WRKSRC}/${d}/*.so ${PREFIX}/lib/ocp
-.endfor
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/ocp
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo
index a658d431536b..3a9883793b96 100644
--- a/audio/ocp/distinfo
+++ b/audio/ocp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocp-0.1.15.tar.gz) = 8d26e8227efdef9d801efdce274a8db6
-SHA256 (ocp-0.1.15.tar.gz) = 7362135f479992ccd91aefa499c48b0db0973da6d1c06472f5bf1b2ccb4c50e1
-SIZE (ocp-0.1.15.tar.gz) = 687220
+MD5 (ocp-0.1.13.tar.gz) = 52074c15a0ee43908276436d703fe5d8
+SHA256 (ocp-0.1.13.tar.gz) = d75f7af686533c1098da4a7540abfe45c72c1df8943c67b1b14b6034b32662b7
+SIZE (ocp-0.1.13.tar.gz) = 659769
diff --git a/audio/ocp/pkg-plist b/audio/ocp/pkg-plist
index a684dd62a396..dad25e7354d6 100644
--- a/audio/ocp/pkg-plist
+++ b/audio/ocp/pkg-plist
@@ -4,7 +4,6 @@ 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/aytype.so
lib/ocp/compat.so
lib/ocp/cphelper.so
lib/ocp/cphlpif.so
@@ -18,11 +17,9 @@ lib/ocp/devsoss.so
lib/ocp/devwmix.so
lib/ocp/devwmixf.so
lib/ocp/devwnone.so
-lib/ocp/flacptype.so
lib/ocp/framelock.so
lib/ocp/fstypes.so
lib/ocp/hardware.so
-lib/ocp/keyhelp.so
lib/ocp/libocp.so
lib/ocp/load669.so
lib/ocp/loadams.so
@@ -33,28 +30,29 @@ lib/ocp/loadokt.so
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/medialib.so
lib/ocp/mixclip.so
%%ADPLUG%%lib/ocp/opltype.so
lib/ocp/pfilesel.so
-lib/ocp/playay.so
-lib/ocp/playflac.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/sidtype.so
lib/ocp/smpbase.so
+%%DATADIR%%/ocp.pak
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
@@ -62,7 +60,6 @@ lib/ocp/smpbase.so
%%PORTDOCS%%%%DOCSDIR%%/KEYBOARD_REMAPS
%%PORTDOCS%%%%DOCSDIR%%/SUID
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DATADIR%%/ocp.pak
+@dirrm lib/ocp
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/ocp