From 6adecac2a823766ba4aa27ff9dbd59193e35e4ea Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Tue, 11 Apr 2006 15:07:48 +0000 Subject: - Update to 0.7.5 PR: ports/95590 Submitted by: Ports Fury --- audio/opmixer/Makefile | 49 ++++++++++++++++++++++--------------- audio/opmixer/distinfo | 6 ++--- audio/opmixer/files/patch-Makefile | 15 ------------ audio/opmixer/files/patch-configure | 23 ----------------- audio/opmixer/files/patch-volset.cc | 12 --------- 5 files changed, 32 insertions(+), 73 deletions(-) delete mode 100644 audio/opmixer/files/patch-Makefile delete mode 100644 audio/opmixer/files/patch-configure delete mode 100644 audio/opmixer/files/patch-volset.cc (limited to 'audio') diff --git a/audio/opmixer/Makefile b/audio/opmixer/Makefile index 48e584cb3b4d..aa42ad28138f 100644 --- a/audio/opmixer/Makefile +++ b/audio/opmixer/Makefile @@ -6,43 +6,52 @@ # PORTNAME= opmixer -PORTVERSION= 0.70 -PORTREVISION= 5 +PORTVERSION= 0.75 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= optronic +DISTNAME= opMixer-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Adjusts a mixer LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk-- -DOCDIR= share/doc/${PORTNAME} USE_BZIP2= yes USE_X_PREFIX= yes -PLIST= ${WRKDIR}/pkg-plist -WRKSRC= ${WRKDIR}/opmixer +USE_GNOME= gtk12 gnometarget +GNU_CONFIGURE= yes -.include +PORTDOCS= README +PLIST_FILES= ${BIN_PROGRAMS:S/^/bin\//} -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif +BIN_PROGRAMS= opmixer opmixer-load volset -pre-install: - ${ECHO_CMD} "bin/opmixer" > ${PLIST} - ${ECHO_CMD} "bin/opmixer-load" >> ${PLIST} - ${ECHO_CMD} "bin/volset" >> ${PLIST} -.if !defined(NOPORTDOCS) - ${ECHO_CMD} ${DOCDIR}/README >> ${PLIST} - ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} -.endif +.include + +post-patch: + @${REINPLACE_CMD} -e \ + 's|(VScale \*)|VScale *|g ; \ + s|(Adjustment \*)|Adjustment *|g ; \ + s|(CheckButton \*)|CheckButton *|g' ${WRKSRC}/src/gui.cc + @${REINPLACE_CMD} -e \ + 's|||g ; \ + s|||g ; \ + s|(LineInfo \*)|LineInfo *|g ; \ + s| cout| std::cout|g ; \ + s| endl| std::endl|g' ${WRKSRC}/src/ossmixer.cc + @${REINPLACE_CMD} -e \ + 's|||g ; \ + s|||g' ${WRKSRC}/src/ossmixer.hh + @${REINPLACE_CMD} -e \ + 's| endl| std::endl|g' ${WRKSRC}/src/volset.cc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/opmixer ${WRKSRC}/opmixer-load \ - ${WRKSRC}/volset ${PREFIX}/bin +.for file in ${BIN_PROGRAMS} + ${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin +.endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif diff --git a/audio/opmixer/distinfo b/audio/opmixer/distinfo index 917466cf7e2c..2446965e68b5 100644 --- a/audio/opmixer/distinfo +++ b/audio/opmixer/distinfo @@ -1,3 +1,3 @@ -MD5 (opmixer-0.70.tar.bz2) = 605b8a91adca44b74960faf2a38c66e4 -SHA256 (opmixer-0.70.tar.bz2) = ab2b51cb78410c690b1b2270ab5da7e9a3ee14d9de06d346a225bb762fe4658e -SIZE (opmixer-0.70.tar.bz2) = 20894 +MD5 (opMixer-0.75.tar.bz2) = 1ae7fd4b7c710e314a3129ba40ce74db +SHA256 (opMixer-0.75.tar.bz2) = 5f9dc8d6934dfc86f2d7b13474868983b09be0c4dd41ee89383c25881377109a +SIZE (opMixer-0.75.tar.bz2) = 49638 diff --git a/audio/opmixer/files/patch-Makefile b/audio/opmixer/files/patch-Makefile deleted file mode 100644 index 719f46977f0a..000000000000 --- a/audio/opmixer/files/patch-Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- Makefile.orig Wed Jun 20 23:34:12 2001 -+++ Makefile Sun Mar 28 12:49:48 2004 -@@ -1,7 +1,7 @@ - # Generated automatically from Makefile.in by configure. --CFLAGS := -g -O2 -DLINUX -Wall --CXXFLAGS := -g -O2 -DLINUX -Wall -I/usr/local/include `gtkmm-config --cflags` --LDFLAGS := `gtkmm-config --libs` -+CFLAGS += -DLINUX -+CXXFLAGS += -DLINUX `gtkmm-config --cflags` -+LDFLAGS := `gtkmm-config --libs | sed 's/-lintl//'` - - all: opmixer opmixer-load volset - %.o : %.c diff --git a/audio/opmixer/files/patch-configure b/audio/opmixer/files/patch-configure deleted file mode 100644 index b978356e8c74..000000000000 --- a/audio/opmixer/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ -$FreeBSD$ - ---- configure.orig Wed Jun 20 16:34:09 2001 -+++ configure Sat Sep 21 14:53:40 2002 -@@ -874,18 +874,6 @@ fi - echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi - fi - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 diff --git a/audio/opmixer/files/patch-volset.cc b/audio/opmixer/files/patch-volset.cc deleted file mode 100644 index ae3d786bd7df..000000000000 --- a/audio/opmixer/files/patch-volset.cc +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ - ---- volset.cc.orig Mon May 21 19:35:48 2001 -+++ volset.cc Thu May 22 15:00:39 2003 -@@ -22,6 +22,6 @@ - int pcmvol = atoi(argv[2]); - myMixer->SetLevel("vol",mainvol); - myMixer->SetLevel("pcm",pcmvol); -- std::cout << "Main : " << mainvol << " PCM : " << pcmvol << endl; -+ std::cout << "Main : " << mainvol << " PCM : " << pcmvol << std::endl; - }; - }; -- cgit v1.2.3