pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/xamp Make build with gcc3. Make it use buildlink...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ea2ae755b3c
branches:  trunk
changeset: 475181:9ea2ae755b3c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 11 12:18:37 2004 +0000

description:
Make build with gcc3. Make it use buildlink3. Closes PR 22281.

diffstat:

 audio/xamp/Makefile         |   16 +-
 audio/xamp/distinfo         |   21 ++-
 audio/xamp/patches/patch-ab |   90 +++++--------
 audio/xamp/patches/patch-ae |    4 +-
 audio/xamp/patches/patch-ah |    9 +-
 audio/xamp/patches/patch-ai |   31 ++--
 audio/xamp/patches/patch-al |    8 +-
 audio/xamp/patches/patch-am |    8 +-
 audio/xamp/patches/patch-as |   10 +
 audio/xamp/patches/patch-at |   21 +++
 audio/xamp/patches/patch-au |   21 +++
 audio/xamp/patches/patch-av |   13 ++
 audio/xamp/patches/patch-aw |   13 ++
 audio/xamp/patches/patch-ax |  270 +++++++++++++++++++++++++++++++++++++++++
 audio/xamp/patches/patch-ay |  284 ++++++++++++++++++++++++++++++++++++++++++++
 15 files changed, 713 insertions(+), 106 deletions(-)

diffs (truncated from 973 to 300 lines):

diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/Makefile
--- a/audio/xamp/Makefile       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/Makefile       Tue May 11 12:18:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/11 12:18:37 wiz Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -14,20 +14,19 @@
 HOMEPAGE=      http://andrej.co.ru/~andrej/programs/xamp/
 COMMENT=       Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
 
-DEPENDS+=      qt1-1.44:../../x11/qt1
-
 WRKSRC=                ${WRKDIR}/xamp-0.8/xamp-0.8g
 DIST_SUBDIR=   xamp
 GNU_CONFIGURE= yes
 CONFIGURE_ENV+=        CXXFLAGS="${CFLAGS}"
+USE_BUILDLINK3=        yes
 USE_GNU_TOOLS+=        make
-USE_X11BASE=   yes
+USE_LANGUAGES= c c++
+USE_X11=       yes
 
-EVAL_PREFIX+=  QT1DIR=qt1
-CONFIGURE_ARGS+=       "--with-qt-dir=${QT1DIR}/qt1"
+CONFIGURE_ARGS+=       --with-qt-dir=${BUILDLINK_PREFIX.qt1:Q}/qt1
 
-CONFIGURE_ENV+=        "QTDIR=${QT1DIR}/qt1"
-CONFIGURE_ENV+=        "MOC=${QT1DIR}/qt1/bin/moc"
+CONFIGURE_ENV+=        QTDIR=${QT1DIR:Q}
+MAKE_ENV+=     QT1DIR=${QT1DIR:Q}
 
 SKIN_DATA=     bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz
 SKIN_DIR=      ${PREFIX}/lib/X11/xamp
@@ -49,4 +48,5 @@
        @${INSTALL_DATA_DIR} ${SKIN_DIR}/mmxxamp-xamp
        ${INSTALL_DATA} ${WRKDIR}/mmxxamp-xamp/*.bmp ${SKIN_DIR}/mmxxamp-xamp
 
+.include "../../x11/qt1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/distinfo
--- a/audio/xamp/distinfo       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/distinfo       Tue May 11 12:18:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/06/28 13:15:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2004/05/11 12:18:37 wiz Exp $
 
 SHA1 (xamp/xamp-0.8-10.tgz) = 65f83c41091184432d64baf1d74aef880733fbd5
 Size (xamp/xamp-0.8-10.tgz) = 239024 bytes
@@ -9,20 +9,27 @@
 SHA1 (xamp/mmxamp.tar.gz) = f703dfe3040bd72db35bb05e26a8eb7841b54887
 Size (xamp/mmxamp.tar.gz) = 41405 bytes
 SHA1 (patch-aa) = a178fc8dee38f4e55eff7289577f2f4b36806574
-SHA1 (patch-ab) = e44114a8770cc7065f230932da2c10dab19bd730
+SHA1 (patch-ab) = 96c0e3db7637c035345cbf2df7d2ee195b538bcb
 SHA1 (patch-ac) = de83b1fd7b170438f818d76d025838f8aa07c752
 SHA1 (patch-ad) = 3595460ae4f848b60d1c829ebfecff92cd2a8e58
-SHA1 (patch-ae) = 2cefc9da5bf237ecb00aa23b5bad6be1036ea6b1
+SHA1 (patch-ae) = 348aff7b4cef04198359c4ea5d7e06cc2b63fd08
 SHA1 (patch-af) = be56e4d380045d0be4c90c88b263cacd611d0eab
 SHA1 (patch-ag) = c17579b095485510bc5dc99d0c22da2f44e152b8
-SHA1 (patch-ah) = b93e477392003318a835c08f5bd1a7b1ba56c0c8
-SHA1 (patch-ai) = 4b301a05e9884466959abce6c7b8092b467800ea
+SHA1 (patch-ah) = 2460dd3cc32f18847f99cdc3f5cefa87601a4c85
+SHA1 (patch-ai) = 9c128048fdb8bed0fb7abd15758a197bd3e35487
 SHA1 (patch-aj) = ab841128854cdacceb54b6c7726d07e5f4fb1140
 SHA1 (patch-ak) = 0d32700aad4cdf232bc1c48376ddcbd762b41852
-SHA1 (patch-al) = 82d615beca8919d1a28e6fa6b344013d771afffe
-SHA1 (patch-am) = 880c459e9e1b8a36eedd04bf372f9458b4bad49b
+SHA1 (patch-al) = 38760f05d5ca7b4557c6d8ddfb0b08cbc4b0dd9b
+SHA1 (patch-am) = 1847c96306c21514adb4f2825bf17c9ea6fd3f0f
 SHA1 (patch-an) = 19fdd266a633afccf7ec4de18a8fc5aa7975354f
 SHA1 (patch-ao) = c3d125d0498052c1f37ce3a3597ca50827779aca
 SHA1 (patch-ap) = 4b4429e3c4a9e8324808cf7b1443db4dddc14cb9
 SHA1 (patch-aq) = f454b488a1b726318080900efd1f23f2d788022f
 SHA1 (patch-ar) = b788d9ed2c1230c37548c21180a0dcf756a93398
+SHA1 (patch-as) = 7e37cf1558ec35e1d19dee520cb6f721a20933b9
+SHA1 (patch-at) = 79ea079c5ad71a382a449879473097d8dbc81be5
+SHA1 (patch-au) = 7d149711f4ba72ab792a6336e87a641aaac931e4
+SHA1 (patch-av) = aa9541f86a3688156d6944dcf88dbc1bb59ceb33
+SHA1 (patch-aw) = 3933c2414cb6e56e1b12d4798dc08b93c4e3e98f
+SHA1 (patch-ax) = 5b4892631e770a4f433d3656384916c1dc715998
+SHA1 (patch-ay) = 18d7aa563176b92a7810a46d7365db59df336e30
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-ab
--- a/audio/xamp/patches/patch-ab       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-ab       Tue May 11 12:18:37 2004 +0000
@@ -1,55 +1,37 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/11 12:18:37 wiz Exp $
 
-*** ../guicontrol.c~   Sat Aug 23 07:30:51 1997
---- ../guicontrol.c    Thu Mar  5 21:31:06 1998
-***************
-*** 312,317 ****
---- 312,325 ----
-        if (quit_flag)
-       {
-  /*     fprintf(stderr, "quit_flag is true\n"); */
-+ 
-+        if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
-+          perror("fcntl");
-+        flags &= ~O_NONBLOCK;
-+   
-+        if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
-+          perror("fcntl");
-+ 
-         exit(0);
-       }
-        while(GUI_FD_TO_PLAY != -1)
-***************
-*** 334,340 ****
-        
-        if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-          perror("fcntl");
-!       flags ^= O_NONBLOCK;
-        
-        if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-          perror("fcntl");
---- 342,348 ----
-        
-        if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-          perror("fcntl");
-!       flags &= ~O_NONBLOCK;
-        
-        if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-          perror("fcntl");
-***************
-*** 394,400 ****
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags ^= O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
---- 402,408 ----
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags &= ~O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
+--- ../guicontrol.c.orig       1998-02-20 20:44:16.000000000 +0100
++++ ../guicontrol.c
+@@ -312,6 +312,14 @@ void gui_control(void)
+       if (quit_flag)
+       {
+ /*      fprintf(stderr, "quit_flag is true\n"); */
++
++        if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
++          perror("fcntl");
++        flags &= ~O_NONBLOCK;
++  
++        if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
++          perror("fcntl");
++
+         exit(0);
+       }
+       while(GUI_FD_TO_PLAY != -1)
+@@ -334,7 +342,7 @@ void gui_control(void)
+        
+        if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
+          perror("fcntl");
+-       flags ^= O_NONBLOCK;
++       flags &= ~O_NONBLOCK;
+        
+        if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
+          perror("fcntl");
+@@ -395,7 +403,7 @@ int decodeMPEG_2(int inFilefd)
+                 /* Set stdin to blocking */
+                 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
+                         perror("fcntl");
+-                flags ^= O_NONBLOCK;
++                flags &= ~O_NONBLOCK;
+                 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
+                         perror("fcntl");
+         }
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-ae
--- a/audio/xamp/patches/patch-ae       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-ae       Tue May 11 12:18:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2002/06/28 13:15:16 agc Exp $
+$NetBSD: patch-ae,v 1.6 2004/05/11 12:18:37 wiz Exp $
 
 --- Makefile.in.orig   Fri Jul 31 01:48:02 1998
 +++ Makefile.in        Mon Oct 16 16:22:20 2000
@@ -18,7 +18,7 @@
        id3.o id3Data.o QLayer.o mid3.o mid3Data.o pixmaps/pixmaps.o
        
 -LIBS = @QT_LDFLAGS@ -lm -lqt
-+LIBS = @QT_LDFLAGS@ -lm -lqt -L${QT1DIR}/qt1/lib -Wl,-R${QT1DIR}/qt1/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
++LIBS = @QT_LDFLAGS@ -lm -lqt -L${QT1DIR}/lib -Wl,-R${QT1DIR}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lXext
  
  all: xamp
  
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-ah
--- a/audio/xamp/patches/patch-ah       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-ah       Tue May 11 12:18:37 2004 +0000
@@ -1,17 +1,14 @@
-$NetBSD: patch-ah,v 1.4 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-ah,v 1.5 2004/05/11 12:18:37 wiz Exp $
 
 --- configure.in.orig  Sun Oct  5 22:42:34 1997
 +++ configure.in       Mon Oct 16 21:08:33 2000
-@@ -71,6 +71,14 @@
+@@ -71,6 +71,11 @@
      CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
      ;;
  
 +  NetBSD)
 +    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
++    CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
 +    ;;
 +
    SunOS)
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-ai
--- a/audio/xamp/patches/patch-ai       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-ai       Tue May 11 12:18:37 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-ai,v 1.5 2004/05/11 12:18:37 wiz Exp $
 
---- configure.orig     Sun Oct 26 22:55:34 1997
-+++ configure  Mon Oct 16 21:09:00 2000
-@@ -970,7 +970,7 @@
+--- configure.orig     1997-10-26 15:55:34.000000000 +0100
++++ configure
+@@ -970,7 +970,7 @@ fi
  #try to guess qt locations
  
  qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
@@ -11,18 +11,15 @@
  
  qt_incdir=NO
  for i in $qt_incdirs;
-@@ -1710,6 +1710,14 @@
-     fi
-     if test "$OS_TYPE" = "FreeBSD" ; then
-       OS_TYPE="BSD"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
+@@ -1714,6 +1714,11 @@ case "$OS_TYPE" in
+     CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
+     ;;
+ 
++  NetBSD)
++    CC="gcc"
++    CFLAGS="${CFLAGS} -DNO_BYTE_SWAPPING"
 +    ;;
 +
-+  NetBSD)
-+    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-     fi
-     CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
-     ;;
+   SunOS)
+     if test "$CC" = "gcc"; then
+        CFLAGS="-O6"
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-al
--- a/audio/xamp/patches/patch-al       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-al       Tue May 11 12:18:37 2004 +0000
@@ -1,17 +1,13 @@
-$NetBSD: patch-al,v 1.2 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-al,v 1.3 2004/05/11 12:18:37 wiz Exp $
 
 --- ../configure.in.orig       Sat Aug 23 17:35:40 1997
 +++ ../configure.in    Mon Oct 16 21:12:37 2000
-@@ -73,6 +73,15 @@
+@@ -73,6 +73,11 @@
      DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
      ;;
  
 +  NetBSD)
 +    CC="gcc"
-+    if test "$ARCH_TYPE" = "i386" ; then
-+      CFLAGS_ARCH="-i586 -pipe"
-+    fi
-+    CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
 +    DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
 +    ;;
 +
diff -r d97e113da799 -r 9ea2ae755b3c audio/xamp/patches/patch-am
--- a/audio/xamp/patches/patch-am       Tue May 11 12:17:21 2004 +0000
+++ b/audio/xamp/patches/patch-am       Tue May 11 12:18:37 2004 +0000
@@ -1,17 +1,13 @@
-$NetBSD: patch-am,v 1.2 2000/10/18 11:22:44 rh Exp $
+$NetBSD: patch-am,v 1.3 2004/05/11 12:18:37 wiz Exp $
 
 --- ../configure.orig  Sat Aug 23 17:11:24 1997
 +++ ../configure       Mon Oct 16 21:13:14 2000
-@@ -1413,6 +1413,15 @@



Home | Main Index | Thread Index | Old Index