Date: Tue, 12 Nov 2013 16:28:53 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333588 - in head: . net net/wizd net/wizd/files Message-ID: <201311121628.rACGSrSE011376@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Nov 12 16:28:52 2013 New Revision: 333588 URL: http://svnweb.freebsd.org/changeset/ports/333588 Log: - 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" <swhetzel@gmail.com> Added: head/net/wizd/ - copied from r325482, head/net/wizd/ head/net/wizd/files/patch-nkfwrap-Makefile (contents, props changed) Modified: head/MOVED head/net/Makefile head/net/wizd/Makefile (contents, props changed) head/net/wizd/files/patch-Makefile (contents, props changed) head/net/wizd/files/patch-nkfwrap__nkfwrap_test.c (contents, props changed) head/net/wizd/files/patch-wizd_http.c (contents, props changed) head/net/wizd/files/patch-wizd_menu.c (contents, props changed) head/net/wizd/pkg-descr (contents, props changed) head/net/wizd/pkg-plist (contents, props changed) Directory Properties: head/net/wizd/distinfo (props changed) head/net/wizd/files/wizd.in (props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Tue Nov 12 16:16:34 2013 (r333587) +++ head/MOVED Tue Nov 12 16:28:52 2013 (r333588) @@ -4849,7 +4849,6 @@ sysutils/empower||2013-08-27|Has expired emulators/xgngeo||2013-08-27|Has expired: Broken for more than 6 month graphics/geglmm||2013-08-27|Has expired: Broken for more than 6 month sysutils/libumberlog||2013-08-27|Has expired: Broken for more than 6 month -net/wizd||2013-08-27|Has expired: Broken for more than 6 month net-p2p/nicotine-plus||2013-08-27|Has expired: Broken for more than 6 month palm/barry||2013-08-27|Has expired: Broken for more than 6 month x11-themes/kde-icons-noia-warm||2013-08-27|Has expired: Broken for more than 6 month Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Tue Nov 12 16:16:34 2013 (r333587) +++ head/net/Makefile Tue Nov 12 16:28:52 2013 (r333588) @@ -1255,6 +1255,7 @@ SUBDIR += wired-tracker SUBDIR += wireshark SUBDIR += wireshark-lite + SUBDIR += wizd SUBDIR += wlan2eth SUBDIR += wmlj SUBDIR += wmnd Modified: head/net/wizd/Makefile ============================================================================== --- head/net/wizd/Makefile Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/Makefile Tue Nov 12 16:28:52 2013 (r333588) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wizd -# Date created: 2008-06-25 -# Whom: Ayumi M <ayu@commun.jp> -# +# Created by: Ayumi M <ayu@commun.jp> # $FreeBSD$ -# PORTNAME= wizd PORTVERSION= 24 @@ -12,37 +8,27 @@ CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/Sources/Sources%20v${PORTVERSION} DISTFILES= wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip -MAINTAINER= ayu@commun.jp -COMMENT= An open-source media server for Syabas-based media players +MAINTAINER= kikuchan@uranus.dti.ne.jp +COMMENT= Open-source media server for Syabas-based media players -LIB_DEPENDS= dvdread:${PORTSDIR}/multimedia/libdvdread \ - jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ + libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-08-27 -BROKEN= does not install - -NO_WRKSUBDIR= yes -USE_DOS2UNIX= Makefile -USE_ZIP= yes +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 ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/wizd.conf ${PREFIX}/etc/wizd.conf.sample - - ${MKDIR} ${DATADIR}/skins -.for DIR in simplicity simplicity_hires - cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${DATADIR}/skins -.endfor - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog.txt ${DOCSDIR} -.endif + ${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 <bsd.port.mk> Modified: head/net/wizd/files/patch-Makefile ============================================================================== --- head/net/wizd/files/patch-Makefile Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/files/patch-Makefile Tue Nov 12 16:28:52 2013 (r333588) @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-08-15 00:53:11.000000000 +0400 -+++ Makefile 2008-08-15 00:54:11.000000000 +0400 +--- 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 @@ -22,3 +22,12 @@ ### -- 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 $@ Added: head/net/wizd/files/patch-nkfwrap-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wizd/files/patch-nkfwrap-Makefile Tue Nov 12 16:28:52 2013 (r333588) @@ -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) Modified: head/net/wizd/files/patch-nkfwrap__nkfwrap_test.c ============================================================================== --- head/net/wizd/files/patch-nkfwrap__nkfwrap_test.c Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/files/patch-nkfwrap__nkfwrap_test.c Tue Nov 12 16:28:52 2013 (r333588) @@ -1,8 +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 <stdio.h> -+#include <string.h> - #include "nkfwrap.h" - - int main() + #include <stdio.h> ++#include <string.h> + #include "nkfwrap.h" + + int main() Modified: head/net/wizd/files/patch-wizd_http.c ============================================================================== --- head/net/wizd/files/patch-wizd_http.c Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/files/patch-wizd_http.c Tue Nov 12 16:28:52 2013 (r333588) @@ -1,20 +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 <dirent.h> - #include <fcntl.h> - #include <libgen.h> + #include <dirent.h> + #include <fcntl.h> + #include <libgen.h> +#ifdef __CYGWIN32__ - #include <sys/cygwin.h> + #include <sys/cygwin.h> +#endif - - #include "wizd.h" - #include "wizd_skin.h" + + #include "wizd.h" + #include "wizd_skin.h" @@ -1072,7 +1074,6 @@ - { - struct stat send_filestat; - int result; -- int len; - - unsigned char file_extension[16]; - + { + struct stat send_filestat; + int result; +- int len; + + unsigned char file_extension[16]; + Modified: head/net/wizd/files/patch-wizd_menu.c ============================================================================== --- head/net/wizd/files/patch-wizd_menu.c Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/files/patch-wizd_menu.c Tue Nov 12 16:28:52 2013 (r333588) @@ -1,20 +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 <errno.h> - #include <libgen.h> - #include <regex.h> + #include <errno.h> + #include <libgen.h> + #include <regex.h> +#ifdef __CYGWIN32__ - #include <sys/cygwin.h> + #include <sys/cygwin.h> +#endif - - #include <dvdread/dvd_reader.h> - #include <dvdread/ifo_types.h> + + #include <dvdread/dvd_reader.h> + #include <dvdread/ifo_types.h> @@ -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) { + 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) { Modified: head/net/wizd/pkg-descr ============================================================================== --- head/net/wizd/pkg-descr Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/pkg-descr Tue Nov 12 16:28:52 2013 (r333588) @@ -1,4 +1,4 @@ Wizd is serving all your media files (video, audio, photo...) to your Syabas-based network player. -WWW: http://wizd.sourceforge.net/ +WWW: http://wizd.sourceforge.net/ Modified: head/net/wizd/pkg-plist ============================================================================== --- head/net/wizd/pkg-plist Tue Aug 27 18:42:37 2013 (r325482) +++ head/net/wizd/pkg-plist Tue Nov 12 16:28:52 2013 (r333588) @@ -1,6 +1,7 @@ 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 -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt +@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 @@ -199,4 +200,3 @@ etc/wizd.conf.sample @dirrm %%DATADIR%%/skins/simplicity @dirrm %%DATADIR%%/skins @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311121628.rACGSrSE011376>