From 9edf275cfabe8741821f7e73d576037d5c14572e Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 12 Nov 2013 16:28:52 +0000 Subject: - Ressurect net/wizd and assign to new maintainer. - Extract files in WRKSRC rather than WRKDIR because USE_RC_SUBR=wizd overwrites WRKDIR/wizd. - Remove carriage return from existing patches. - Add patches to fix parallel build. - Staging. PR: ports/182495 Submitted by: "Scot W. Hetzel" --- net/wizd/Makefile | 34 +++++ net/wizd/distinfo | 4 + net/wizd/files/patch-Makefile | 33 +++++ net/wizd/files/patch-nkfwrap-Makefile | 10 ++ net/wizd/files/patch-nkfwrap__nkfwrap_test.c | 8 ++ net/wizd/files/patch-wizd_http.c | 20 +++ net/wizd/files/patch-wizd_menu.c | 20 +++ net/wizd/files/wizd.in | 29 ++++ net/wizd/pkg-descr | 4 + net/wizd/pkg-plist | 202 +++++++++++++++++++++++++++ 10 files changed, 364 insertions(+) create mode 100644 net/wizd/Makefile create mode 100644 net/wizd/distinfo create mode 100644 net/wizd/files/patch-Makefile create mode 100644 net/wizd/files/patch-nkfwrap-Makefile create mode 100644 net/wizd/files/patch-nkfwrap__nkfwrap_test.c create mode 100644 net/wizd/files/patch-wizd_http.c create mode 100644 net/wizd/files/patch-wizd_menu.c create mode 100644 net/wizd/files/wizd.in create mode 100644 net/wizd/pkg-descr create mode 100644 net/wizd/pkg-plist (limited to 'net/wizd') diff --git a/net/wizd/Makefile b/net/wizd/Makefile new file mode 100644 index 000000000000..c575f42f1929 --- /dev/null +++ b/net/wizd/Makefile @@ -0,0 +1,34 @@ +# Created by: Ayumi M +# $FreeBSD$ + +PORTNAME= wizd +PORTVERSION= 24 +PORTREVISION= 5 +CATEGORIES= net multimedia +MASTER_SITES= SF/${PORTNAME}/Sources/Sources%20v${PORTVERSION} +DISTFILES= wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip + +MAINTAINER= kikuchan@uranus.dti.ne.jp +COMMENT= Open-source media server for Syabas-based media players + +LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ + libjpeg.so:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf + +USE_DOS2UNIX= Makefile nkfwrap/Makefile nkfwrap/nkfwrap_test.c \ + wizd_http.c wizd_menu.c +USE_RC_SUBR= wizd +USE_ZIP= yes +EXTRACT_AFTER_ARGS= -d ${WRKSRC} + +post-patch: + @${REINPLACE_CMD} -e 's|./skin|${DATADIR}/skins|' ${WRKSRC}/wizd.conf + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wizd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/wizd.conf ${STAGEDIR}${PREFIX}/etc/wizd.conf.sample + ${MKDIR} ${STAGEDIR}${DATADIR}/skins + cd ${WRKSRC} && ${COPYTREE_SHARE} "simplicity simplicity_hires" \ + ${STAGEDIR}${DATADIR}/skins + +.include diff --git a/net/wizd/distinfo b/net/wizd/distinfo new file mode 100644 index 000000000000..d6425c37c3e3 --- /dev/null +++ b/net/wizd/distinfo @@ -0,0 +1,4 @@ +SHA256 (wizd_sources_v24.zip) = 439def5e3e0e59c0ed6dfe83dc57da497d6fd826951f2fc4398007afdce31ecb +SIZE (wizd_sources_v24.zip) = 414369 +SHA256 (simplicity_v1-2.zip) = 614c68b66022865d4d78523f3a3f3b9efe023f717ec1b2b97d2d95d867b735bb +SIZE (simplicity_v1-2.zip) = 495381 diff --git a/net/wizd/files/patch-Makefile b/net/wizd/files/patch-Makefile new file mode 100644 index 000000000000..175f9e75de69 --- /dev/null +++ b/net/wizd/files/patch-Makefile @@ -0,0 +1,33 @@ +--- Makefile.orig 2013-11-12 12:35:19.000000000 +0100 ++++ Makefile 2013-11-12 15:41:42.000000000 +0100 +@@ -5,19 +5,12 @@ + ################################################################################ + .SUFFIXES: .c .o .obj + +-CC = gcc +-CFLAGS = -pipe -O2 -Wall +-CFLAGS += -g # debug symbols + CFLAGS += -D_FILE_OFFSET_BITS=64 + CFLAGS += -D_LARGEFILE_SOURCE + ### -- If you dont want to use JPEG resize feature, comment it out. + CFLAGS += -DRESIZE_JPEG +-CFLAGS += -I/usr/local/include +-LDFLAGS += -static -L/usr/local/lib -ljpeg -ldvdread +- +-# keep the following lines only if you have the w32api library +-LDFLAGS += -L/lib/w32api -lole32 -luuid +-CFLAGS += -DHAVE_W32API ++CFLAGS += -I${LOCALBASE}/include ++LDFLAGS += -L${LOCALBASE}/lib -ljpeg -ldvdread -lm -lcompat + + ### -- + LDFLAGS += -s # strip symbols +@@ -215,7 +208,7 @@ + myavinfo.o wizd_aviread.o + + nkfwrap/nkfwrap.o: +- cd nkfwrap; $(MAKE) all ++ $(MAKE) -C nkfwrap all + + .c.o: + $(CC) $(CFLAGS) -c $< -o $@ diff --git a/net/wizd/files/patch-nkfwrap-Makefile b/net/wizd/files/patch-nkfwrap-Makefile new file mode 100644 index 000000000000..05aeef975bce --- /dev/null +++ b/net/wizd/files/patch-nkfwrap-Makefile @@ -0,0 +1,10 @@ +--- nkfwrap/Makefile.orig ++++ nkfwrap/Makefile +@@ -12,7 +12,6 @@ + $(CC) -shared -o libnkf2.so nkfwrap.o + + nkfwrap.o: nkf nkf/nkf.c nkf/utf8tbl.c nkf/config.h nkfwrap.c +- $(CC) $(CFLAGS) -c nkfwrap.c + + nkfwrap_test: nkfwrap_test.o nkfwrap.o + $(CC) $(CFLAGS) -o nkfwrap_test nkfwrap_test.o nkfwrap.o $(LDFLAGS) diff --git a/net/wizd/files/patch-nkfwrap__nkfwrap_test.c b/net/wizd/files/patch-nkfwrap__nkfwrap_test.c new file mode 100644 index 000000000000..53e9628a8322 --- /dev/null +++ b/net/wizd/files/patch-nkfwrap__nkfwrap_test.c @@ -0,0 +1,8 @@ +--- nkfwrap/nkfwrap_test.c.orig 2008-07-02 12:30:10.000000000 +0900 ++++ nkfwrap/nkfwrap_test.c 2008-07-02 13:13:52.000000000 +0900 +@@ -1,4 +1,5 @@ + #include ++#include + #include "nkfwrap.h" + + int main() diff --git a/net/wizd/files/patch-wizd_http.c b/net/wizd/files/patch-wizd_http.c new file mode 100644 index 000000000000..8904b52f868d --- /dev/null +++ b/net/wizd/files/patch-wizd_http.c @@ -0,0 +1,20 @@ +--- wizd_http.c.orig 2008-07-02 12:30:10.000000000 +0900 ++++ wizd_http.c 2008-07-02 13:12:25.000000000 +0900 +@@ -23,7 +23,9 @@ + #include + #include + #include ++#ifdef __CYGWIN32__ + #include ++#endif + + #include "wizd.h" + #include "wizd_skin.h" +@@ -1072,7 +1074,6 @@ + { + struct stat send_filestat; + int result; +- int len; + + unsigned char file_extension[16]; + diff --git a/net/wizd/files/patch-wizd_menu.c b/net/wizd/files/patch-wizd_menu.c new file mode 100644 index 000000000000..d195de9a9bec --- /dev/null +++ b/net/wizd/files/patch-wizd_menu.c @@ -0,0 +1,20 @@ +--- wizd_menu.c.orig 2008-07-02 12:30:10.000000000 +0900 ++++ wizd_menu.c 2008-07-02 13:14:51.000000000 +0900 +@@ -27,7 +27,9 @@ + #include + #include + #include ++#ifdef __CYGWIN32__ + #include ++#endif + + #include + #include +@@ -3432,7 +3434,6 @@ + debug_log_output("ext = '%s'", file_info_p[count].ext); + } + +- checkmime: + if ((mime = lookup_mime_by_ext(file_info_p[count].ext)) == NULL) { + # ifdef HAVE_W32API + if (strcmp(file_info_p[count].ext, "lnk") == 0) { diff --git a/net/wizd/files/wizd.in b/net/wizd/files/wizd.in new file mode 100644 index 000000000000..4239fec4ba22 --- /dev/null +++ b/net/wizd/files/wizd.in @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: wizd +# REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to enable wizd: +# wizd_enable (bool): Set it to "YES" to enable wizd. +# Default is "NO". +# wizd_flags (str): Flags passed to widz on startup. +# Default is "". +# + +. /etc/rc.subr + +name="wizd" +rcvar=wizd_enable + +command="%%PREFIX%%/bin/$name" +command_args="-d" +required_files="%%PREFIX%%/etc/$name.conf" + +load_rc_config $name + +: ${wizd_enable="NO"} + +run_rc_command "$1" diff --git a/net/wizd/pkg-descr b/net/wizd/pkg-descr new file mode 100644 index 000000000000..aeee3f68b6b4 --- /dev/null +++ b/net/wizd/pkg-descr @@ -0,0 +1,4 @@ +Wizd is serving all your media files (video, audio, photo...) to your +Syabas-based network player. + +WWW: http://wizd.sourceforge.net/ diff --git a/net/wizd/pkg-plist b/net/wizd/pkg-plist new file mode 100644 index 000000000000..a080fa5105a7 --- /dev/null +++ b/net/wizd/pkg-plist @@ -0,0 +1,202 @@ +bin/wizd +@unexec if cmp -s %D/etc/wizd.conf %D/etc/wizd.conf.sample; then rm -f %D/etc/wizd.conf; fi +etc/wizd.conf.sample +@exec if [ ! -f %B/wizd.conf ]; then cp -p %B/%f %B/wizd.conf; fi +%%DATADIR%%/skins/simplicity/back-delete.jpg +%%DATADIR%%/skins/simplicity/back-portal.jpg +%%DATADIR%%/skins/simplicity/back.jpg +%%DATADIR%%/skins/simplicity/delete_head.html +%%DATADIR%%/skins/simplicity/delete_tail.html +%%DATADIR%%/skins/simplicity/down.png +%%DATADIR%%/skins/simplicity/favorite.png +%%DATADIR%%/skins/simplicity/favorite2.png +%%DATADIR%%/skins/simplicity/files.png +%%DATADIR%%/skins/simplicity/files2.png +%%DATADIR%%/skins/simplicity/head.html +%%DATADIR%%/skins/simplicity/icon-blank.gif +%%DATADIR%%/skins/simplicity/icon_delete.png +%%DATADIR%%/skins/simplicity/icon_dir.png +%%DATADIR%%/skins/simplicity/icon_document.png +%%DATADIR%%/skins/simplicity/icon_image.png +%%DATADIR%%/skins/simplicity/icon_iso.png +%%DATADIR%%/skins/simplicity/icon_jpeg.png +%%DATADIR%%/skins/simplicity/icon_movie.png +%%DATADIR%%/skins/simplicity/icon_music.png +%%DATADIR%%/skins/simplicity/icon_svi.png +%%DATADIR%%/skins/simplicity/icon_unknown.png +%%DATADIR%%/skins/simplicity/icon_url.png +%%DATADIR%%/skins/simplicity/icon_videots.png +%%DATADIR%%/skins/simplicity/image_viewer.html +%%DATADIR%%/skins/simplicity/line_album.html +%%DATADIR%%/skins/simplicity/line_aviinfo.html +%%DATADIR%%/skins/simplicity/line_chapter.html +%%DATADIR%%/skins/simplicity/line_delete.html +%%DATADIR%%/skins/simplicity/line_dir.html +%%DATADIR%%/skins/simplicity/line_document.html +%%DATADIR%%/skins/simplicity/line_image.html +%%DATADIR%%/skins/simplicity/line_iso.html +%%DATADIR%%/skins/simplicity/line_jpeg.html +%%DATADIR%%/skins/simplicity/line_movie.html +%%DATADIR%%/skins/simplicity/line_mp3info.html +%%DATADIR%%/skins/simplicity/line_music.html +%%DATADIR%%/skins/simplicity/line_musiclist.html +%%DATADIR%%/skins/simplicity/line_playlist.html +%%DATADIR%%/skins/simplicity/line_pseudo.html +%%DATADIR%%/skins/simplicity/line_svi.html +%%DATADIR%%/skins/simplicity/line_svi_file.html +%%DATADIR%%/skins/simplicity/line_unknown.html +%%DATADIR%%/skins/simplicity/line_url.html +%%DATADIR%%/skins/simplicity/line_videots.html +%%DATADIR%%/skins/simplicity/music.png +%%DATADIR%%/skins/simplicity/music2.png +%%DATADIR%%/skins/simplicity/nav-parentdir.gif +%%DATADIR%%/skins/simplicity/next-gr.png +%%DATADIR%%/skins/simplicity/next.png +%%DATADIR%%/skins/simplicity/option_menu.html +%%DATADIR%%/skins/simplicity/option_menu.jpg +%%DATADIR%%/skins/simplicity/photos.png +%%DATADIR%%/skins/simplicity/photos2.png +%%DATADIR%%/skins/simplicity/prev-gr.png +%%DATADIR%%/skins/simplicity/prev.png +%%DATADIR%%/skins/simplicity/puce.png +%%DATADIR%%/skins/simplicity/readme.txt +%%DATADIR%%/skins/simplicity/services.png +%%DATADIR%%/skins/simplicity/services2.png +%%DATADIR%%/skins/simplicity/spacer.gif +%%DATADIR%%/skins/simplicity/start.html +%%DATADIR%%/skins/simplicity/tail.html +%%DATADIR%%/skins/simplicity/thumb_aviinfo.html +%%DATADIR%%/skins/simplicity/thumb_chapter.html +%%DATADIR%%/skins/simplicity/thumb_delete.png +%%DATADIR%%/skins/simplicity/thumb_dir.gif +%%DATADIR%%/skins/simplicity/thumb_dir.html +%%DATADIR%%/skins/simplicity/thumb_dir.png +%%DATADIR%%/skins/simplicity/thumb_document.html +%%DATADIR%%/skins/simplicity/thumb_document.png +%%DATADIR%%/skins/simplicity/thumb_head.html +%%DATADIR%%/skins/simplicity/thumb_image.html +%%DATADIR%%/skins/simplicity/thumb_image.png +%%DATADIR%%/skins/simplicity/thumb_iso.html +%%DATADIR%%/skins/simplicity/thumb_iso.png +%%DATADIR%%/skins/simplicity/thumb_jpeg.html +%%DATADIR%%/skins/simplicity/thumb_jpeg.png +%%DATADIR%%/skins/simplicity/thumb_movie.html +%%DATADIR%%/skins/simplicity/thumb_movie.png +%%DATADIR%%/skins/simplicity/thumb_mp3info.html +%%DATADIR%%/skins/simplicity/thumb_music.html +%%DATADIR%%/skins/simplicity/thumb_music.png +%%DATADIR%%/skins/simplicity/thumb_musiclist.html +%%DATADIR%%/skins/simplicity/thumb_playlist.html +%%DATADIR%%/skins/simplicity/thumb_pseudo.html +%%DATADIR%%/skins/simplicity/thumb_row.html +%%DATADIR%%/skins/simplicity/thumb_svi.html +%%DATADIR%%/skins/simplicity/thumb_svi.png +%%DATADIR%%/skins/simplicity/thumb_tail.html +%%DATADIR%%/skins/simplicity/thumb_unknown.html +%%DATADIR%%/skins/simplicity/thumb_unknown.png +%%DATADIR%%/skins/simplicity/thumb_url.html +%%DATADIR%%/skins/simplicity/thumb_url.png +%%DATADIR%%/skins/simplicity/thumb_videots.png +%%DATADIR%%/skins/simplicity/up.png +%%DATADIR%%/skins/simplicity/videos.png +%%DATADIR%%/skins/simplicity/videos2.png +%%DATADIR%%/skins/simplicity/wizd_skin.conf +%%DATADIR%%/skins/simplicity_hires/back-delete.jpg +%%DATADIR%%/skins/simplicity_hires/back-portal.jpg +%%DATADIR%%/skins/simplicity_hires/back.jpg +%%DATADIR%%/skins/simplicity_hires/delete_head.html +%%DATADIR%%/skins/simplicity_hires/delete_tail.html +%%DATADIR%%/skins/simplicity_hires/down.png +%%DATADIR%%/skins/simplicity_hires/favorite.png +%%DATADIR%%/skins/simplicity_hires/favorite2.png +%%DATADIR%%/skins/simplicity_hires/files.png +%%DATADIR%%/skins/simplicity_hires/files2.png +%%DATADIR%%/skins/simplicity_hires/head.html +%%DATADIR%%/skins/simplicity_hires/icon-blank.gif +%%DATADIR%%/skins/simplicity_hires/icon_delete.png +%%DATADIR%%/skins/simplicity_hires/icon_dir.png +%%DATADIR%%/skins/simplicity_hires/icon_document.png +%%DATADIR%%/skins/simplicity_hires/icon_image.png +%%DATADIR%%/skins/simplicity_hires/icon_iso.png +%%DATADIR%%/skins/simplicity_hires/icon_jpeg.png +%%DATADIR%%/skins/simplicity_hires/icon_movie.png +%%DATADIR%%/skins/simplicity_hires/icon_music.png +%%DATADIR%%/skins/simplicity_hires/icon_svi.png +%%DATADIR%%/skins/simplicity_hires/icon_unknown.png +%%DATADIR%%/skins/simplicity_hires/icon_url.png +%%DATADIR%%/skins/simplicity_hires/icon_videots.png +%%DATADIR%%/skins/simplicity_hires/image_viewer.html +%%DATADIR%%/skins/simplicity_hires/line_album.html +%%DATADIR%%/skins/simplicity_hires/line_aviinfo.html +%%DATADIR%%/skins/simplicity_hires/line_chapter.html +%%DATADIR%%/skins/simplicity_hires/line_delete.html +%%DATADIR%%/skins/simplicity_hires/line_dir.html +%%DATADIR%%/skins/simplicity_hires/line_document.html +%%DATADIR%%/skins/simplicity_hires/line_image.html +%%DATADIR%%/skins/simplicity_hires/line_iso.html +%%DATADIR%%/skins/simplicity_hires/line_jpeg.html +%%DATADIR%%/skins/simplicity_hires/line_movie.html +%%DATADIR%%/skins/simplicity_hires/line_mp3info.html +%%DATADIR%%/skins/simplicity_hires/line_music.html +%%DATADIR%%/skins/simplicity_hires/line_musiclist.html +%%DATADIR%%/skins/simplicity_hires/line_playlist.html +%%DATADIR%%/skins/simplicity_hires/line_pseudo.html +%%DATADIR%%/skins/simplicity_hires/line_svi.html +%%DATADIR%%/skins/simplicity_hires/line_svi_file.html +%%DATADIR%%/skins/simplicity_hires/line_unknown.html +%%DATADIR%%/skins/simplicity_hires/line_url.html +%%DATADIR%%/skins/simplicity_hires/line_videots.html +%%DATADIR%%/skins/simplicity_hires/music.png +%%DATADIR%%/skins/simplicity_hires/music2.png +%%DATADIR%%/skins/simplicity_hires/nav-parentdir.gif +%%DATADIR%%/skins/simplicity_hires/next-gr.png +%%DATADIR%%/skins/simplicity_hires/next.png +%%DATADIR%%/skins/simplicity_hires/option_menu.html +%%DATADIR%%/skins/simplicity_hires/option_menu.jpg +%%DATADIR%%/skins/simplicity_hires/photos.png +%%DATADIR%%/skins/simplicity_hires/photos2.png +%%DATADIR%%/skins/simplicity_hires/prev-gr.png +%%DATADIR%%/skins/simplicity_hires/prev.png +%%DATADIR%%/skins/simplicity_hires/puce.png +%%DATADIR%%/skins/simplicity_hires/readme.txt +%%DATADIR%%/skins/simplicity_hires/services.png +%%DATADIR%%/skins/simplicity_hires/services2.png +%%DATADIR%%/skins/simplicity_hires/spacer.gif +%%DATADIR%%/skins/simplicity_hires/start.html +%%DATADIR%%/skins/simplicity_hires/tail.html +%%DATADIR%%/skins/simplicity_hires/thumb_chapter.html +%%DATADIR%%/skins/simplicity_hires/thumb_delete.png +%%DATADIR%%/skins/simplicity_hires/thumb_dir.html +%%DATADIR%%/skins/simplicity_hires/thumb_dir.png +%%DATADIR%%/skins/simplicity_hires/thumb_document.html +%%DATADIR%%/skins/simplicity_hires/thumb_document.png +%%DATADIR%%/skins/simplicity_hires/thumb_head.html +%%DATADIR%%/skins/simplicity_hires/thumb_image.html +%%DATADIR%%/skins/simplicity_hires/thumb_image.png +%%DATADIR%%/skins/simplicity_hires/thumb_iso.html +%%DATADIR%%/skins/simplicity_hires/thumb_iso.png +%%DATADIR%%/skins/simplicity_hires/thumb_jpeg.html +%%DATADIR%%/skins/simplicity_hires/thumb_jpeg.png +%%DATADIR%%/skins/simplicity_hires/thumb_movie.html +%%DATADIR%%/skins/simplicity_hires/thumb_movie.png +%%DATADIR%%/skins/simplicity_hires/thumb_music.html +%%DATADIR%%/skins/simplicity_hires/thumb_music.png +%%DATADIR%%/skins/simplicity_hires/thumb_musiclist.html +%%DATADIR%%/skins/simplicity_hires/thumb_playlist.html +%%DATADIR%%/skins/simplicity_hires/thumb_pseudo.html +%%DATADIR%%/skins/simplicity_hires/thumb_row.html +%%DATADIR%%/skins/simplicity_hires/thumb_svi.html +%%DATADIR%%/skins/simplicity_hires/thumb_svi.png +%%DATADIR%%/skins/simplicity_hires/thumb_tail.html +%%DATADIR%%/skins/simplicity_hires/thumb_unknown.html +%%DATADIR%%/skins/simplicity_hires/thumb_unknown.png +%%DATADIR%%/skins/simplicity_hires/thumb_url.html +%%DATADIR%%/skins/simplicity_hires/thumb_url.png +%%DATADIR%%/skins/simplicity_hires/up.png +%%DATADIR%%/skins/simplicity_hires/videos.png +%%DATADIR%%/skins/simplicity_hires/videos2.png +%%DATADIR%%/skins/simplicity_hires/wizd_skin.conf +@dirrm %%DATADIR%%/skins/simplicity_hires +@dirrm %%DATADIR%%/skins/simplicity +@dirrm %%DATADIR%%/skins +@dirrm %%DATADIR%% -- cgit v1.2.3