diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-07-12 15:01:45 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-07-12 15:01:45 +0000 |
| commit | daffe00d4a57c0ef6a21947a8121b8d233d8d3a5 (patch) | |
| tree | 713942325bda393305edb21d46cd7f38d213aebc /devel/bennugd-modules | |
| parent | 51498efaebaad1106dcf0d3f70c8feaa14c411ee (diff) | |
| download | ports-daffe00d4a57c0ef6a21947a8121b8d233d8d3a5.tar.gz ports-daffe00d4a57c0ef6a21947a8121b8d233d8d3a5.zip | |
Notes
Diffstat (limited to 'devel/bennugd-modules')
| -rw-r--r-- | devel/bennugd-modules/Makefile | 2 | ||||
| -rw-r--r-- | devel/bennugd-modules/files/patch-mod__map-file__png.c (renamed from devel/bennugd-modules/files/patch-mod_map-file_png.c) | 62 | ||||
| -rw-r--r-- | devel/bennugd-modules/files/patch-mod__mem-mod__mem.c (renamed from devel/bennugd-modules/files/patch-mod_mem-mod_mem.c) | 32 |
3 files changed, 49 insertions, 47 deletions
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile index 310a7d34b081..c9f6f3851999 100644 --- a/devel/bennugd-modules/Makefile +++ b/devel/bennugd-modules/Makefile @@ -27,6 +27,8 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd" MAKE_JOBS_SAFE= yes +USE_DOS2UNIX= *.c + WRKSRC= ${WRKDIR}/bennugd/${PORTNAME} post-extract: diff --git a/devel/bennugd-modules/files/patch-mod_map-file_png.c b/devel/bennugd-modules/files/patch-mod__map-file__png.c index 5479d7cbdd10..26e44948b742 100644 --- a/devel/bennugd-modules/files/patch-mod_map-file_png.c +++ b/devel/bennugd-modules/files/patch-mod__map-file__png.c @@ -1,37 +1,37 @@ --- mod_map/file_png.c.orig 2009-07-22 04:02:45.000000000 +0200 +++ mod_map/file_png.c 2012-05-27 11:54:18.000000000 +0200 @@ -24,6 +24,7 @@ - /* --------------------------------------------------------------------------- */
-
- #include <png.h>
-+#include <pngpriv.h>
-
- #include "mod_map.h"
-
+ /* --------------------------------------------------------------------------- */ + + #include <png.h> ++#include <pngpriv.h> + + #include "mod_map.h" + @@ -89,7 +90,7 @@ -
- /* Rutina de error */
-
-- if ( setjmp( png_ptr->jmpbuf ) )
-+ if ( setjmp( png_jmpbuf(png_ptr) ) )
- {
- png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ;
- file_close( png ) ;
+ + /* Rutina de error */ + +- if ( setjmp( png_ptr->jmpbuf ) ) ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) + { + png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ; + file_close( png ) ; @@ -286,7 +287,7 @@ -
- /* Fin */
-
-- if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ;
-+ if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ;
-
- bitmap->modified = 1 ;
-
+ + /* Fin */ + +- if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ; ++ if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ; + + bitmap->modified = 1 ; + @@ -356,7 +357,7 @@ -
- /* Error handling... */
-
-- if ( setjmp( png_ptr->jmpbuf ) )
-+ if ( setjmp( png_jmpbuf(png_ptr) ) )
- {
- png_destroy_write_struct( &png_ptr, NULL ) ;
- free( rowpointers ) ;
+ + /* Error handling... */ + +- if ( setjmp( png_ptr->jmpbuf ) ) ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) + { + png_destroy_write_struct( &png_ptr, NULL ) ; + free( rowpointers ) ; diff --git a/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c b/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c index bd50f146a618..b94bdc5842f8 100644 --- a/devel/bennugd-modules/files/patch-mod_mem-mod_mem.c +++ b/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c @@ -1,20 +1,20 @@ --- mod_mem/mod_mem.c.orig 2009-06-15 22:34:24.000000000 +0400 +++ mod_mem/mod_mem.c 2009-11-06 06:28:55.000000000 +0300 @@ -128,7 +128,7 @@ - get_system_info( &info );
- return B_PAGE_SIZE * ( info.max_pages - info.used_pages );
-
--#elif !defined(TARGET_MAC)
-+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD)
- /* Linux and other Unix (?) */
- struct sysinfo meminf;
- int fv;
+ get_system_info( &info ); + return B_PAGE_SIZE * ( info.max_pages - info.used_pages ); + +-#elif !defined(TARGET_MAC) ++#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) + /* Linux and other Unix (?) */ + struct sysinfo meminf; + int fv; @@ -166,7 +166,7 @@ - get_system_info( &info );
- return B_PAGE_SIZE * ( info.max_pages );
-
--#elif !defined(TARGET_MAC)
-+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD)
- /* Linux and other Unix (?) */
- struct sysinfo meminf;
- int fv;
+ get_system_info( &info ); + return B_PAGE_SIZE * ( info.max_pages ); + +-#elif !defined(TARGET_MAC) ++#elif !defined(TARGET_MAC) && !defined(TARGET_BSD) + /* Linux and other Unix (?) */ + struct sysinfo meminf; + int fv; |