From owner-svn-ports-all@FreeBSD.ORG Thu Sep 6 05:22:27 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CEA17106566C; Thu, 6 Sep 2012 05:22:27 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B8E9B8FC0A; Thu, 6 Sep 2012 05:22:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q865MR6T065229; Thu, 6 Sep 2012 05:22:27 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q865MRq4065224; Thu, 6 Sep 2012 05:22:27 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201209060522.q865MRq4065224@svn.freebsd.org> From: Olli Hauer Date: Thu, 6 Sep 2012 05:22:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303739 - in head/lang/neko: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Sep 2012 05:22:27 -0000 Author: ohauer Date: Thu Sep 6 05:22:27 2012 New Revision: 303739 URL: http://svn.freebsd.org/changeset/ports/303739 Log: - remove apache13 support - use DOS2UNIX macro - rewrite for options NG - use USE_XXX macros instead (BUILD|RUN)_DEPENDS PR: 170752 Submitted by: ohauer@ Approved by: maintainer timeout Modified: head/lang/neko/Makefile (contents, props changed) head/lang/neko/files/patch-libs_std_process.c (contents, props changed) head/lang/neko/files/patch-libs_std_sys.c (contents, props changed) head/lang/neko/pkg-plist (contents, props changed) Modified: head/lang/neko/Makefile ============================================================================== --- head/lang/neko/Makefile Thu Sep 6 05:16:51 2012 (r303738) +++ head/lang/neko/Makefile Thu Sep 6 05:22:27 2012 (r303739) @@ -20,91 +20,70 @@ ONLY_FOR_ARCHS= i386 amd64 USE_AUTOTOOLS= libtool:env USE_GMAKE= yes +USE_DOS2UNIX= yes +DOS2UNIX_REGEX= .*(Makefile|\.(c|h|neko|nml))$$ -OPTIONS= APACHE13 "Build with mod_neko for Apache 1.3.x" off \ - APACHE22 "Build with mod_neko for Apache 2.2.x" off \ - MYSQL4 "Build with MySQL 4.x library" off \ - MYSQL5 "Build with MySQL 5.x library" off \ - SQLITE3 "Build with Sqlite 3.x SQL library" off \ - PCRE "Build with PCRE library" on \ - GTK2 "Build with Gtk 2.x UI library" on +OPTIONS_DEFINE= APACHE MYSQL SQLITE PCRE GTK2 +OPTIONS_DEFAULT= PCRE GTK2 -.include +OPTIONS_SINGLE= MYSQL +OPTIONS_SINGLE_MYSQL= MYSQL4 MYSQL5 -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIBKEYNAME= +MYSQL4_DESC= Build against MySQL 4.1 +MYSQL5_DESC= Build against MySQL 5.1 -.if defined(WITH_APACHE13) && defined(WITH_APACHE22) -IGNORE= option APACHE13 and APACHE22 conflict -.endif +.include -.if defined(WITH_APACHE13) -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -RUN_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 -CFLAGS+= -I${LOCALBASE}/include/apache -PLIST_SUB+= APACHE13= -.else +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LIBKEYNAME+= mod_neko mod_tora -PLIST_SUB+= APACHE13="@comment " -.endif -.if defined(WITH_APACHE22) -BUILD_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache22 -RUN_DEPENDS+= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache22 +.if ${PORT_OPTIONS:MAPACHE} +USE_APACHE= 22 CFLAGS+= -I${LOCALBASE}/include/apache22 -PLIST_SUB+= APACHE22= +PLIST_SUB+= APACHE22="" .else LIBKEYNAME+= mod_neko2 mod_tora2 PLIST_SUB+= APACHE22="@comment " .endif -.if defined(WITH_MYSQL4) && defined(WITH_MYSQL5) -IGNORE= option MYSQL4 and MYSQL5 conflict -.endif - -.if defined(WITH_MYSQL4) -BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql41-client -RUN_DEPENDS+= mysql:${PORTSDIR}/databases/mysql41-client +.if ${PORT_OPTIONS:MMYSQL4} +USE_MYSQL= 41 CFLAGS+= -I${LOCALBASE}/include/mysql -PLIST_SUB+= MYSQL4= +PLIST_SUB+= MYSQL4="" .else LIBKEYNAME+= mysql PLIST_SUB+= MYSQL4="@comment " .endif -.if defined(WITH_MYSQL5) -BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql51-client -RUN_DEPENDS+= mysql:${PORTSDIR}/databases/mysql51-client +.if ${PORT_OPTIONS:MMYSQL5} +USE_MYSQL= 51 CFLAGS+= -I${LOCALBASE}/include/mysql -PLIST_SUB+= MYSQL5= +PLIST_SUB+= MYSQL5="" .else LIBKEYNAME+= mysql5 PLIST_SUB+= MYSQL5="@comment " .endif -.if defined(WITH_SQLITE3) -BUILD_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 -RUN_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 -PLIST_SUB+= SQLITE3= +.if ${PORT_OPTIONS:MSQLITE} +USE_SQLITE= yes +PLIST_SUB+= SQLITE3="" .else LIBKEYNAME+= sqlite PLIST_SUB+= SQLITE3="@comment " .endif -.if defined(WITH_PCRE) -BUILD_DEPENDS+= ${LOCALBASE}/include/pcre.h:${PORTSDIR}/devel/pcre -RUN_DEPENDS+= ${LOCALBASE}/include/pcre.h:${PORTSDIR}/devel/pcre -PLIST_SUB+= PCRE= +.if ${PORT_OPTIONS:MPCRE} +LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +PLIST_SUB+= PCRE="" .else LIBKEYNAME+= regexp PLIST_SUB+= PCRE="@comment " .endif -.if defined(WITH_GTK2) -BUILD_DEPENDS+= ${LOCALBASE}/include/gtk-2.0:${PORTSDIR}/x11-toolkits/gtk20 -RUN_DEPENDS+= ${LOCALBASE}/include/gtk-2.0:${PORTSDIR}/x11-toolkits/gtk20 -PLIST_SUB+= GTK2= +.if ${PORT_OPTIONS:MGTK2} +USE_GNOME= gtk20 +PLIST_SUB+= GTK2="" .else LIBKEYNAME+= ui PLIST_SUB+= GTK2="@comment " @@ -140,24 +119,19 @@ post-patch: ${WRKSRC}/src/tools/install.neko .endfor .endif -.if defined(WITH_APACHE13) - @${REINPLACE_CMD} \ - -e 's,"/usr/include/apache-1.3","${PREFIX}/include/apache",' \ - ${WRKSRC}/src/tools/install.neko -.endif -.if defined(WITH_APACHE22) +.if ${PORT_OPTIONS:MAPACHE} @${REINPLACE_CMD} \ -e 's,"/usr/include/apache2","${PREFIX}/include/apache22",' \ ${WRKSRC}/src/tools/install.neko .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} @${REINPLACE_CMD} \ -e 's,"/usr/include/gtk-2.0","${PREFIX}/include/gtk-2.0",' \ ${WRKSRC}/src/tools/install.neko @${REINPLACE_CMD} \ -e 's,NEKO_LINUX,NEKO_BSD,' ${WRKSRC}/libs/ui/ui.c .endif -.if ${ARCH} == "amd64" && defined(WITH_MYSQL4) +.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MMYSQL4} @${ECHO_CMD} @${ECHO_CMD} "=======================================================" @${ECHO_CMD} @@ -169,7 +143,7 @@ post-patch: .endif post-install: -.if defined(WITH_APACHE13) || defined(WITH_APACHE22) +.if ${PORT_OPTIONS:MAPACHE} @${ECHO_CMD} @${ECHO_CMD} "=======================================================" @${ECHO_CMD} @@ -181,4 +155,4 @@ post-install: @${ECHO_CMD} .endif -.include +.include Modified: head/lang/neko/files/patch-libs_std_process.c ============================================================================== --- head/lang/neko/files/patch-libs_std_process.c Thu Sep 6 05:16:51 2012 (r303738) +++ head/lang/neko/files/patch-libs_std_process.c Thu Sep 6 05:22:27 2012 (r303739) @@ -1,11 +1,11 @@ --- libs/std/process.c.orig 2009-06-19 00:08:00.000000000 +0900 +++ libs/std/process.c 2009-06-19 00:08:06.000000000 +0900 @@ -23,7 +23,7 @@ - # include - # include - # ifndef NEKO_MAC --# include -+# include - # endif - #endif - + # include + # include + # ifndef NEKO_MAC +-# include ++# include + # endif + #endif + Modified: head/lang/neko/files/patch-libs_std_sys.c ============================================================================== --- head/lang/neko/files/patch-libs_std_sys.c Thu Sep 6 05:16:51 2012 (r303738) +++ head/lang/neko/files/patch-libs_std_sys.c Thu Sep 6 05:22:27 2012 (r303739) @@ -1,22 +1,22 @@ --- libs/std/sys.c.orig 2009-06-19 00:08:19.000000000 +0900 +++ libs/std/sys.c 2009-06-19 00:11:42.000000000 +0900 @@ -35,7 +35,9 @@ - # include - # include - # include + # include + # include + # include +#ifndef __FreeBSD__ - # include + # include +#endif - #endif - - #ifdef NEKO_MAC + #endif + + #ifdef NEKO_MAC @@ -123,6 +125,9 @@ - Set the locale for LC_TIME, returns true on success - **/ - static value set_time_locale( value l ) { + Set the locale for LC_TIME, returns true on success + **/ + static value set_time_locale( value l ) { +#ifdef __FreeBSD__ +#undef NEKO_POSIX +#endif - #ifdef NEKO_POSIX - locale_t lc, old; - val_check(l,string); + #ifdef NEKO_POSIX + locale_t lc, old; + val_check(l,string); Modified: head/lang/neko/pkg-plist ============================================================================== --- head/lang/neko/pkg-plist Thu Sep 6 05:16:51 2012 (r303738) +++ head/lang/neko/pkg-plist Thu Sep 6 05:22:27 2012 (r303739) @@ -6,8 +6,6 @@ bin/nekotools lib/libneko.so lib/neko/std.ndll lib/neko/zlib.ndll -%%APACHE13%%lib/neko/mod_neko.ndll -%%APACHE13%%lib/neko/mod_tora.ndll %%APACHE22%%lib/neko/mod_neko2.ndll %%APACHE22%%lib/neko/mod_tora2.ndll %%MYSQL4%%lib/neko/mysql.ndll