Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/libcddb/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	31 Oct 2006 02:24:33 -0000	1.17
+++ Makefile	16 Apr 2007 01:58:32 -0000
@@ -22,11 +22,4 @@
 CONFIGURE_ARGS=	--without-cdio
 CONFIGURE_ENV=	CPPFLAGS="-DICONV_CONST=\"const\""
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES+=	${PATCHDIR}/cddb.h-systypes-patch \
-		${PATCHDIR}/cddb_ni.h-systypes-patch
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/cddb.h-systypes-patch
===================================================================
RCS file: files/cddb.h-systypes-patch
diff -N files/cddb.h-systypes-patch
--- files/cddb.h-systypes-patch	22 Jul 2004 01:10:30 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- include/cddb/cddb.h.orig	Wed Jul 21 15:34:48 2004
-+++ include/cddb/cddb.h	Wed Jul 21 15:35:03 2004
-@@ -27,6 +27,7 @@
- #endif
- 
- 
-+#include <sys/types.h>
- #include <cddb/cddb_config.h>
- #include <cddb/cddb_error.h>
- #include <cddb/cddb_track.h>
Index: files/cddb_ni.h-systypes-patch
===================================================================
RCS file: files/cddb_ni.h-systypes-patch
diff -N files/cddb_ni.h-systypes-patch
--- files/cddb_ni.h-systypes-patch	22 Jul 2004 01:10:30 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- include/cddb/cddb_ni.h.orig	Wed Jul 21 15:35:13 2004
-+++ include/cddb/cddb_ni.h	Wed Jul 21 15:35:32 2004
-@@ -31,6 +31,7 @@
- #  include <config.h>
- #endif
- 
-+#include <sys/types.h>
- #include "cddb/cddb_regex.h"
- #include "cddb/cddb.h"
- #include "cddb/cddb_conn_ni.h"