diff options
-rw-r--r-- | graphics/libvisual/Makefile | 15 | ||||
-rw-r--r-- | graphics/libvisual/distinfo | 4 | ||||
-rw-r--r-- | graphics/libvisual/files/extra-patch-libvisual_lv_cpu.c | 12 | ||||
-rw-r--r-- | graphics/libvisual/files/patch-libvisual_lv_mem.h | 11 | ||||
-rw-r--r-- | graphics/libvisual/pkg-plist | 5 | ||||
-rw-r--r-- | graphics/libvisual04/Makefile | 15 | ||||
-rw-r--r-- | graphics/libvisual04/distinfo | 4 | ||||
-rw-r--r-- | graphics/libvisual04/files/extra-patch-libvisual_lv_cpu.c | 12 | ||||
-rw-r--r-- | graphics/libvisual04/files/patch-libvisual_lv_mem.h | 11 | ||||
-rw-r--r-- | graphics/libvisual04/pkg-plist | 5 |
10 files changed, 60 insertions, 34 deletions
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile index 3c2a22b..c515699 100644 --- a/graphics/libvisual/Makefile +++ b/graphics/libvisual/Makefile @@ -9,7 +9,7 @@ # can work with it. Backwards compatiblity is known to be broken in the past. PORTNAME= libvisual -PORTVERSION= 0.1.7 +PORTVERSION= 0.2.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,13 +21,20 @@ USE_XLIBS= yes USE_GNOME= gnomehack pkgconfig USE_REINPLACE= yes USE_LIBTOOL_VER=15 -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 50001 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-libvisual_lv_cpu.c +.endif + post-patch: @${REINPLACE_CMD} -e 's|-Wno-unused-variable||g' \ -e 's|-O3|${CFLAGS}|g' \ ${WRKSRC}/libvisual/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/libvisual/distinfo b/graphics/libvisual/distinfo index 8628184..396cdba 100644 --- a/graphics/libvisual/distinfo +++ b/graphics/libvisual/distinfo @@ -1,2 +1,2 @@ -MD5 (libvisual-0.1.7.tar.gz) = 29976f5f10b36fa2346294dcb2280d19 -SIZE (libvisual-0.1.7.tar.gz) = 374096 +MD5 (libvisual-0.2.0.tar.gz) = 668236dcbd252c70f1beff551f36b8b3 +SIZE (libvisual-0.2.0.tar.gz) = 431141 diff --git a/graphics/libvisual/files/extra-patch-libvisual_lv_cpu.c b/graphics/libvisual/files/extra-patch-libvisual_lv_cpu.c new file mode 100644 index 0000000..8e6d1cd --- /dev/null +++ b/graphics/libvisual/files/extra-patch-libvisual_lv_cpu.c @@ -0,0 +1,12 @@ +--- libvisual/lv_cpu.c.orig Sun Mar 20 20:17:51 2005 ++++ libvisual/lv_cpu.c Sun Mar 20 20:18:19 2005 +@@ -65,6 +65,9 @@ + #include "lv_log.h" + #include "lv_cpu.h" + ++/* stolen from 5.3-stable's unistd.h */ ++#define _SC_NPROCESSORS_ONLN 58 ++ + static VisCPU _lv_cpu_caps; + static int _lv_cpu_initialized = FALSE; + diff --git a/graphics/libvisual/files/patch-libvisual_lv_mem.h b/graphics/libvisual/files/patch-libvisual_lv_mem.h deleted file mode 100644 index ae93d97..0000000 --- a/graphics/libvisual/files/patch-libvisual_lv_mem.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libvisual/lv_mem.h.orig Mon Sep 6 17:10:52 2004 -+++ libvisual/lv_mem.h Sat Oct 23 16:34:40 2004 -@@ -7,7 +7,7 @@ - extern "C" { - #endif /* __cplusplus */ - --#if defined(__GNUC__) && !defined(VISUAL_OS_WIN32) -+#if defined(__GNUC__) && !defined(VISUAL_OS_WIN32) && !defined(__FreeBSD__) - void *visual_mem_malloc0 (visual_size_t nbytes) __attribute_malloc__; - #else - void *visual_mem_malloc0 (visual_size_t nbytes); diff --git a/graphics/libvisual/pkg-plist b/graphics/libvisual/pkg-plist index 851ec38..3983e4d 100644 --- a/graphics/libvisual/pkg-plist +++ b/graphics/libvisual/pkg-plist @@ -17,12 +17,17 @@ include/libvisual/lv_list.h include/libvisual/lv_log.h include/libvisual/lv_mem.h include/libvisual/lv_morph.h +include/libvisual/lv_object.h include/libvisual/lv_palette.h include/libvisual/lv_param.h include/libvisual/lv_plugin.h include/libvisual/lv_random.h include/libvisual/lv_songinfo.h +include/libvisual/lv_thread.h include/libvisual/lv_time.h +include/libvisual/lv_transform.h +include/libvisual/lv_types.h +include/libvisual/lv_ui.h include/libvisual/lv_video.h include/libvisual/lvconfig.h lib/libvisual.a diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile index 3c2a22b..c515699 100644 --- a/graphics/libvisual04/Makefile +++ b/graphics/libvisual04/Makefile @@ -9,7 +9,7 @@ # can work with it. Backwards compatiblity is known to be broken in the past. PORTNAME= libvisual -PORTVERSION= 0.1.7 +PORTVERSION= 0.2.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,13 +21,20 @@ USE_XLIBS= yes USE_GNOME= gnomehack pkgconfig USE_REINPLACE= yes USE_LIBTOOL_VER=15 -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 50001 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-libvisual_lv_cpu.c +.endif + post-patch: @${REINPLACE_CMD} -e 's|-Wno-unused-variable||g' \ -e 's|-O3|${CFLAGS}|g' \ ${WRKSRC}/libvisual/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/libvisual04/distinfo b/graphics/libvisual04/distinfo index 8628184..396cdba 100644 --- a/graphics/libvisual04/distinfo +++ b/graphics/libvisual04/distinfo @@ -1,2 +1,2 @@ -MD5 (libvisual-0.1.7.tar.gz) = 29976f5f10b36fa2346294dcb2280d19 -SIZE (libvisual-0.1.7.tar.gz) = 374096 +MD5 (libvisual-0.2.0.tar.gz) = 668236dcbd252c70f1beff551f36b8b3 +SIZE (libvisual-0.2.0.tar.gz) = 431141 diff --git a/graphics/libvisual04/files/extra-patch-libvisual_lv_cpu.c b/graphics/libvisual04/files/extra-patch-libvisual_lv_cpu.c new file mode 100644 index 0000000..8e6d1cd --- /dev/null +++ b/graphics/libvisual04/files/extra-patch-libvisual_lv_cpu.c @@ -0,0 +1,12 @@ +--- libvisual/lv_cpu.c.orig Sun Mar 20 20:17:51 2005 ++++ libvisual/lv_cpu.c Sun Mar 20 20:18:19 2005 +@@ -65,6 +65,9 @@ + #include "lv_log.h" + #include "lv_cpu.h" + ++/* stolen from 5.3-stable's unistd.h */ ++#define _SC_NPROCESSORS_ONLN 58 ++ + static VisCPU _lv_cpu_caps; + static int _lv_cpu_initialized = FALSE; + diff --git a/graphics/libvisual04/files/patch-libvisual_lv_mem.h b/graphics/libvisual04/files/patch-libvisual_lv_mem.h deleted file mode 100644 index ae93d97..0000000 --- a/graphics/libvisual04/files/patch-libvisual_lv_mem.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libvisual/lv_mem.h.orig Mon Sep 6 17:10:52 2004 -+++ libvisual/lv_mem.h Sat Oct 23 16:34:40 2004 -@@ -7,7 +7,7 @@ - extern "C" { - #endif /* __cplusplus */ - --#if defined(__GNUC__) && !defined(VISUAL_OS_WIN32) -+#if defined(__GNUC__) && !defined(VISUAL_OS_WIN32) && !defined(__FreeBSD__) - void *visual_mem_malloc0 (visual_size_t nbytes) __attribute_malloc__; - #else - void *visual_mem_malloc0 (visual_size_t nbytes); diff --git a/graphics/libvisual04/pkg-plist b/graphics/libvisual04/pkg-plist index 851ec38..3983e4d 100644 --- a/graphics/libvisual04/pkg-plist +++ b/graphics/libvisual04/pkg-plist @@ -17,12 +17,17 @@ include/libvisual/lv_list.h include/libvisual/lv_log.h include/libvisual/lv_mem.h include/libvisual/lv_morph.h +include/libvisual/lv_object.h include/libvisual/lv_palette.h include/libvisual/lv_param.h include/libvisual/lv_plugin.h include/libvisual/lv_random.h include/libvisual/lv_songinfo.h +include/libvisual/lv_thread.h include/libvisual/lv_time.h +include/libvisual/lv_transform.h +include/libvisual/lv_types.h +include/libvisual/lv_ui.h include/libvisual/lv_video.h include/libvisual/lvconfig.h lib/libvisual.a |