Bug 95590 - Update port: audio/opmixer to 0.75
Summary: Update port: audio/opmixer to 0.75
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pav Lucistnik
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-04-10 17:10 UTC by tkato432
Modified: 2006-04-11 16:07 UTC (History)
0 users

See Also:

Attachments
file.diff (4.50 KB, patch)
2006-04-10 17:10 UTC, tkato432 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2006-04-10 17:10:18 UTC 
- Update to version 0.75

Remove file:
files/patch-Makefile
files/patch-configure
files/patch-volset.cc
Comment 1 Pav Lucistnik freebsd_committer freebsd_triage 2006-04-10 22:33:53 UTC 
State Changed
From-To: open->feedback

Does not compile: 

c++ -DPACKAGE="opMixer" -DVERSION="0.75" -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_SOUNDCARD_H=1 -DHAVE_STRSTR=1  -I. -I. -I/usr/X11R6/lib/gtkmm/include -I/usr/X11R6/include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I/usr/local/include -I/usr/local/include/sigc++-1.0 -O2 -fno-strict-aliasing -pipe    -O2 -fno-strict-aliasing -pipe -c gui.cc 
gui.cc: In constructor `MixerGUI::MixerGUI(char*)': 
gui.cc:187: error: array bound forbidden after parenthesized type-id 
gui.cc:187: note: try removing the parentheses around the type-id 
gui.cc:188: error: array bound forbidden after parenthesized type-id 
gui.cc:188: note: try removing the parentheses around the type-id 
gui.cc:189: error: array bound forbidden after parenthesized type-id 
gui.cc:189: note: try removing the parentheses around the type-id 
*** Error code 1
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2006-04-10 22:33:53 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pav

Track
Comment 3 tkato432 2006-04-11 11:52:38 UTC 
Try with this one, please.


diff -urN /usr/ports/audio/opmixer/Makefile audio/opmixer/Makefile
--- /usr/ports/audio/opmixer/Makefile	Wed Mar  8 13:23:38 2006
+++ audio/opmixer/Makefile	Tue Apr 11 15:34:03 2006
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	opmixer
-PORTVERSION=	0.70
-PORTREVISION=	5
+PORTVERSION=	0.75
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+DISTNAME=	opMixer-${PORTVERSION}
 MASTER_SITE_SUBDIR=	optronic
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,32 +17,39 @@
 
 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
+
+PORTDOCS=	README
+PLIST_FILES=	${BIN_PROGRAMS:S/^/bin\//}
+
+BIN_PROGRAMS=	opmixer opmixer-load volset
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-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
+post-patch:
+	@${REINPLACE_CMD} -e  \
+		's|(VScale \*)|VScale *| ; \
+		 s|(Adjustment \*)|Adjustment *| ; \
+		 s|(CheckButton \*)|CheckButton *|' ${WRKSRC}/src/gui.cc
+	@${REINPLACE_CMD} -e  \
+		's|<string\.h>|<cstring>| ; \
+		 s|<iostream\.h>|<iostream>| ; \
+		 s|(LineInfo \*)|LineInfo *|' ${WRKSRC}/src/ossmixer.cc
+	@${REINPLACE_CMD} -e  \
+		's|<stdlib\.h>|<cstdlib>| ; \
+		 s|<stdio\.h>|<cstdio>|' ${WRKSRC}/src/ossmixer.hh
+	@${REINPLACE_CMD} -e  \
+		's|<< endl;|<< std::endl;|' ${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 -urN /usr/ports/audio/opmixer/distinfo audio/opmixer/distinfo
--- /usr/ports/audio/opmixer/distinfo	Sun Jan  8 14:59:01 2006
+++ audio/opmixer/distinfo	Thu Apr  6 21:49:21 2006
@@ -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 -urN /usr/ports/audio/opmixer/files/patch-Makefile audio/opmixer/files/patch-Makefile
--- /usr/ports/audio/opmixer/files/patch-Makefile	Mon Mar 29 13:28:45 2004
+++ audio/opmixer/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,15 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-Makefile,v 1.2 2004/03/28 12:50:27 trevor Exp $
-
---- 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 -urN /usr/ports/audio/opmixer/files/patch-configure audio/opmixer/files/patch-configure
--- /usr/ports/audio/opmixer/files/patch-configure	Sun Sep 22 07:31:35 2002
+++ audio/opmixer/files/patch-configure	Thu Jan  1 09:00:00 1970
@@ -1,23 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-configure,v 1.1 2002/09/21 22:31:35 trevor Exp $
-
---- 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 -urN /usr/ports/audio/opmixer/files/patch-volset.cc audio/opmixer/files/patch-volset.cc
--- /usr/ports/audio/opmixer/files/patch-volset.cc	Fri May 23 00:07:05 2003
+++ audio/opmixer/files/patch-volset.cc	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-volset.cc,v 1.1 2003/05/22 15:07:05 trevor Exp $
-
---- 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;
-   };
- };
Comment 4 Pav Lucistnik freebsd_committer freebsd_triage 2006-04-11 13:37:32 UTC 
KATO Tsuguru pí¹e v út 11. 04. 2006 v 19:52 +0900:

> Try with this one, please.


Fails on second .c file now:

c++ -DPACKAGE=\"opMixer\" -DVERSION=\"0.75\" -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_SOUNDCARD_H=1 -DHAVE_STRSTR=1  -I. -I. -I/usr/X11R6/lib/gtkmm/include -I/usr/X11R6/include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I/usr/local/include -I/usr/local/include/sigc++-1.0 -O2 -fno-strict-aliasing -pipe    -O2 -fno-strict-aliasing -pipe -c ossmixer.cc
ossmixer.cc: In member function `void ossMixer::init()':
ossmixer.cc:21: error: `endl' undeclared (first use this function)
ossmixer.cc:21: error: (Each undeclared identifier is reported only once for each function it appears in.)
ossmixer.cc: In member function `int ossMixer::SaveToFile(const char*)':
ossmixer.cc:95: error: `cout' undeclared (first use this function)
ossmixer.cc:95: error: `endl' undeclared (first use this function)
ossmixer.cc: In member function `int ossMixer::LoadFromFile(const char*)':
ossmixer.cc:110: error: `cout' undeclared (first use this function)
ossmixer.cc:110: error: `endl' undeclared (first use this function)
*** Error code 1

-- 
Pav Lucistnik <pav@oook.cz>
              <pav@FreeBSD.org>

It's time for the penguin on top of your television set to explode.
Comment 5 tkato432 2006-04-11 14:34:30 UTC 
Pav Lucistnik <pav@FreeBSD.org> wrote:

> Fails on second .c file now:

Ah, that's right. Here is a correct patch.


diff -urN /usr/ports/audio/opmixer/Makefile audio/opmixer/Makefile
--- /usr/ports/audio/opmixer/Makefile	Wed Mar  8 13:23:38 2006
+++ audio/opmixer/Makefile	Tue Apr 11 22:12:24 2006
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	opmixer
-PORTVERSION=	0.70
-PORTREVISION=	5
+PORTVERSION=	0.75
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+DISTNAME=	opMixer-${PORTVERSION}
 MASTER_SITE_SUBDIR=	optronic
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,32 +17,41 @@
 
 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
+
+PORTDOCS=	README
+PLIST_FILES=	${BIN_PROGRAMS:S/^/bin\//}
+
+BIN_PROGRAMS=	opmixer opmixer-load volset
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-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
+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|<string\.h>|<cstring>|g ; \
+		 s|<iostream\.h>|<iostream>|g ; \
+		 s|(LineInfo \*)|LineInfo *|g ; \
+		 s| cout| std::cout|g ; \
+		 s| endl| std::endl|g' ${WRKSRC}/src/ossmixer.cc
+	@${REINPLACE_CMD} -e  \
+		's|<stdlib\.h>|<cstdlib>|g ; \
+		 s|<stdio\.h>|<cstdio>|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 -urN /usr/ports/audio/opmixer/distinfo audio/opmixer/distinfo
--- /usr/ports/audio/opmixer/distinfo	Sun Jan  8 14:59:01 2006
+++ audio/opmixer/distinfo	Thu Apr  6 21:49:21 2006
@@ -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 -urN /usr/ports/audio/opmixer/files/patch-Makefile audio/opmixer/files/patch-Makefile
--- /usr/ports/audio/opmixer/files/patch-Makefile	Mon Mar 29 13:28:45 2004
+++ audio/opmixer/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,15 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-Makefile,v 1.2 2004/03/28 12:50:27 trevor Exp $
-
---- 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 -urN /usr/ports/audio/opmixer/files/patch-configure audio/opmixer/files/patch-configure
--- /usr/ports/audio/opmixer/files/patch-configure	Sun Sep 22 07:31:35 2002
+++ audio/opmixer/files/patch-configure	Thu Jan  1 09:00:00 1970
@@ -1,23 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-configure,v 1.1 2002/09/21 22:31:35 trevor Exp $
-
---- 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 -urN /usr/ports/audio/opmixer/files/patch-volset.cc audio/opmixer/files/patch-volset.cc
--- /usr/ports/audio/opmixer/files/patch-volset.cc	Fri May 23 00:07:05 2003
+++ audio/opmixer/files/patch-volset.cc	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
-$FreeBSD: ports/audio/opmixer/files/patch-volset.cc,v 1.1 2003/05/22 15:07:05 trevor Exp $
-
---- 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;
-   };
- };
Comment 6 Pav Lucistnik freebsd_committer freebsd_triage 2006-04-11 16:07:38 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!