diff options
author | drochner <drochner> | 2006-05-29 15:22:29 +0000 |
---|---|---|
committer | drochner <drochner> | 2006-05-29 15:22:29 +0000 |
commit | a7d76f9dd17fa7e6f7d171445216472d9e429953 (patch) | |
tree | 83522e23fc93c198ad0a36cddb61c7afed0b079f | |
parent | 44d37d4fd4c58d777eb3de4ab4fcff925356b428 (diff) | |
download | pkgsrc-a7d76f9dd17fa7e6f7d171445216472d9e429953.tar.gz |
update to 1.2.1
changes:
-builds with gcc4 now
-some fixes for problems with compiler optimization
-rw-r--r-- | sysutils/cdrdao/Makefile | 4 | ||||
-rw-r--r-- | sysutils/cdrdao/Makefile.common | 4 | ||||
-rw-r--r-- | sysutils/cdrdao/distinfo | 12 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ai | 24 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ak | 20 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ap | 13 | ||||
-rw-r--r-- | sysutils/gcdmaster/Makefile | 7 |
7 files changed, 38 insertions, 46 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index eed084ee6e8..2c4d00f8448 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2006/02/05 23:10:49 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2006/05/29 15:22:29 drochner Exp $ .include "../../sysutils/cdrdao/Makefile.common" -PKGREVISION= 5 - PKGNAME= cdrdao-${CDRDAO_VER} COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common index eae8a13978e..8c56099fa8b 100644 --- a/sysutils/cdrdao/Makefile.common +++ b/sysutils/cdrdao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/07/19 16:33:57 drochner Exp $ +# $NetBSD: Makefile.common,v 1.4 2006/05/29 15:22:29 drochner Exp $ DISTNAME= cdrdao-${CDRDAO_VER} CATEGORIES= sysutils @@ -15,7 +15,7 @@ DISTINFO_FILE= ${CDRDAODIR}/distinfo PKG_INSTALLATION_TYPES= overwrite pkgviews -CDRDAO_VER= 1.2.0 +CDRDAO_VER= 1.2.1 GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index fc258c4d3ee..98f4a437f1a 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2005/10/10 21:36:56 joerg Exp $ +$NetBSD: distinfo,v 1.17 2006/05/29 15:22:29 drochner Exp $ -SHA1 (cdrdao-1.2.0.tar.gz) = 0da9f0ae829dba5afe7efc34981ce4ad1dd7d210 -RMD160 (cdrdao-1.2.0.tar.gz) = 031be2ce0ed0894d1026a90f9ce62b3154849d14 -Size (cdrdao-1.2.0.tar.gz) = 2041966 bytes +SHA1 (cdrdao-1.2.1.tar.gz) = 530725bd0ed29eeda97eb5fcedbf7b4b44f4e863 +RMD160 (cdrdao-1.2.1.tar.gz) = 4f6cabd016af69746db6d31d58ec0a7f49c38fde +Size (cdrdao-1.2.1.tar.gz) = 1728003 bytes SHA1 (patch-aa) = ac38ac97ffbd502c5b5ea4de771ce92c520ae10e SHA1 (patch-ab) = 4aa2499b6e5768d7f8dee32b1b7d0bfc55d30f71 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f @@ -11,9 +11,9 @@ SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45 SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f -SHA1 (patch-ai) = 3441edbe934b8e2a996259aaf293618c94c147d5 +SHA1 (patch-ai) = 130d05798d6835f3c317c7806b1b5b40a05fe7f3 SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd -SHA1 (patch-ak) = 28d58c003a2025d032df061eff1394d2372826c8 SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 +SHA1 (patch-ap) = a9d9c2fdb35a30af650608ea827e79028ce37fc8 diff --git a/sysutils/cdrdao/patches/patch-ai b/sysutils/cdrdao/patches/patch-ai index 079c74168cb..82623cb87e5 100644 --- a/sysutils/cdrdao/patches/patch-ai +++ b/sysutils/cdrdao/patches/patch-ai @@ -1,26 +1,26 @@ -$NetBSD: patch-ai,v 1.2 2005/10/10 21:36:56 joerg Exp $ +$NetBSD: patch-ai,v 1.3 2006/05/29 15:22:29 drochner Exp $ ---- configure.orig 2005-05-12 18:30:44.000000000 +0000 +--- configure.orig 2005-11-23 21:26:24.000000000 +0100 +++ configure -@@ -10250,7 +10250,7 @@ _ACEOF +@@ -10336,7 +10336,7 @@ fi *-freebsd2*) scsilib_libs="$scsilib_libs" ;; -- *-freebsd[3456]*) -+ *-freebsd[3456]* | *-dragonfly*) +- *-freebsd[34567]*) ++ *-freebsd[34567]* | *-dragonfly*) scsilib_libs="$scsilib_libs -lcam" ;; esac -@@ -10268,7 +10268,7 @@ else +@@ -10355,7 +10355,7 @@ else scsilib_objs="ScsiIf-linux.o sg_err.o" ;; -- *-freebsd[3456]*) -+ *-freebsd[3456]* | *-dragonfly*) +- *-freebsd[34567]*) ++ *-freebsd[34567]* | *-dragonfly*) scsilib_libs="-lcam" scsilib_objs="ScsiIf-freebsd-cam.o" ;; -@@ -10496,7 +10496,7 @@ case "$host" in +@@ -10583,7 +10583,7 @@ case "$host" in esac case "$host" in @@ -29,12 +29,12 @@ $NetBSD: patch-ai,v 1.2 2005/10/10 21:36:56 joerg Exp $ if test "$use_pthreads" = yes; then LDFLAGS="-pthread $LDFLAGS" thread_libs="" -@@ -10514,7 +10514,7 @@ _ACEOF +@@ -10601,7 +10601,7 @@ _ACEOF esac case "$host" in -- *-linux-* | *-freebsd[456]* | *-solaris*) -+ *-linux-* | *-freebsd[456]* | *-solaris* | *-netbsd* | *-dragonfly*) +- *-linux* | *-freebsd[4567]* | *-solaris*) ++ *-linux* | *-freebsd[4567]* | *-solaris* | *-netbsd* | *-dragonfly*) sound_if_obj=SoundIF-ao.o ;; diff --git a/sysutils/cdrdao/patches/patch-ak b/sysutils/cdrdao/patches/patch-ak deleted file mode 100644 index 00f1ad28fb9..00000000000 --- a/sysutils/cdrdao/patches/patch-ak +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2005/09/26 01:01:46 fredb Exp $ - ---- trackdb/Track.cc.orig 2005-05-09 10:39:47.000000000 -0500 -+++ trackdb/Track.cc -@@ -411,6 +411,7 @@ bool Track::recomputeLength() - } - - update(); -+ return true; - } - - // Sets ISRC code. Expected string: "CCOOOYYSSSSS" -@@ -596,6 +597,7 @@ bool Track::resolveFilename(const char* - } - } - } -+ return true; - } - - // Locates 'SubTrack' that contains specified sample. diff --git a/sysutils/cdrdao/patches/patch-ap b/sysutils/cdrdao/patches/patch-ap new file mode 100644 index 00000000000..edc77413cc4 --- /dev/null +++ b/sysutils/cdrdao/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2006/05/29 15:22:29 drochner Exp $ + +--- xdao/ProgressDialog.h.orig 2006-05-29 10:39:33.000000000 +0200 ++++ xdao/ProgressDialog.h +@@ -62,7 +62,7 @@ private: + bool leadTimeFilled_; + + struct timeval time_; +- bool ProgressDialog::time(); ++ bool time(); + + Gtk::Button *cancelButton_; + Gtk::Button *closeButton_; diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile index 8ef13ea224e..442dc55d576 100644 --- a/sysutils/gcdmaster/Makefile +++ b/sysutils/gcdmaster/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:48 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2006/05/29 15:22:29 drochner Exp $ .include "../../sysutils/cdrdao/Makefile.common" -PKGREVISION= 9 - PKGNAME= gcdmaster-${CDRDAO_VER} COMMENT= Gnome UI frontend to cdrdao @@ -16,6 +14,7 @@ USE_DIRS+= gnome1-1.5 CONFIGURE_ARGS+= --without-posix-threads CONFIGURE_ARGS+= --with-xdao INSTALLATION_DIRS= bin man/man1 share/applications share/pixmaps +USE_TOOLS+= pkg-config do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin @@ -29,5 +28,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade \ ${PREFIX}/share/gcdmaster/glade +.include "../../devel/libsigc++2/buildlink3.mk" +.include "../../x11/gtkmm/buildlink3.mk" .include "../../devel/libgnomeuimm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |