Attachment 126977 Details for Bug 170752 – neko.diff

[patch] neko.diff

neko.diff (text/plain), 4.62 KB, created by Olli Hauer on 2012-08-18 19:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2012-08-18 19:50:07 UTC

Size: 4.62 KB

patch

obsolete

>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 302724)
>+++ pkg-plist	(working copy)
>@@ -6,8 +6,6 @@
> 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
>Index: Makefile
>===================================================================
>--- Makefile	(revision 302724)
>+++ Makefile	(working copy)
>@@ -21,37 +21,24 @@
> USE_AUTOTOOLS=	libtool:env
> USE_GMAKE=	yes
> 
>-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
>+NO_OPTIONS_SORT=yes
>+OPTIONS_DEFINE=	APACHE PCRE GTK2 SQLITE MYSQL
>+OPTIONS_SINGLE=	MYSQL
>+OPTIONS_SINGLE_MYSQL=MYSQL5 MYSQL4
>+OPTIONS_DEFAULT=PCRE GTK2
> 
>-.include <bsd.port.pre.mk>
>+MYSQL_DESC=	Choose from MySQL backends
>+MYSQL4_DESC=	MySQL 4.x backend
>+MYSQL5_DESC=	MySQL 5.x backend
> 
>+.include <bsd.port.options.mk>
>+
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-LIBKEYNAME=
>-
>-.if defined(WITH_APACHE13) && defined(WITH_APACHE22)
>-IGNORE= option APACHE13 and APACHE22 conflict
>-.endif
>-
>-.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
> 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=
> .else
>@@ -59,11 +46,7 @@
> PLIST_SUB+=	APACHE22="@comment "
> .endif
> 
>-.if defined(WITH_MYSQL4) && defined(WITH_MYSQL5)
>-IGNORE= option MYSQL4 and MYSQL5 conflict
>-.endif
>-
>-.if defined(WITH_MYSQL4)
>+.if ${PORT_OPTIONS:MMYSQL4}
> BUILD_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql41-client
> RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql41-client
> CFLAGS+=	-I${LOCALBASE}/include/mysql
>@@ -73,7 +56,7 @@
> PLIST_SUB+=	MYSQL4="@comment "
> .endif
> 
>-.if defined(WITH_MYSQL5)
>+.if ${PORT_OPTIONS:MMYSQL5}
> BUILD_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql51-client
> RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql51-client
> CFLAGS+=	-I${LOCALBASE}/include/mysql
>@@ -83,7 +66,7 @@
> PLIST_SUB+=	MYSQL5="@comment "
> .endif
> 
>-.if defined(WITH_SQLITE3)
>+.if ${PORT_OPTIONS:MSQLITE}
> BUILD_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
> RUN_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
> PLIST_SUB+=	SQLITE3=
>@@ -92,7 +75,7 @@
> PLIST_SUB+=	SQLITE3="@comment "
> .endif
> 
>-.if defined(WITH_PCRE)
>+.if ${PORT_OPTIONS:MPCRE}
> BUILD_DEPENDS+=	${LOCALBASE}/include/pcre.h:${PORTSDIR}/devel/pcre
> RUN_DEPENDS+=	${LOCALBASE}/include/pcre.h:${PORTSDIR}/devel/pcre
> PLIST_SUB+=	PCRE=
>@@ -101,7 +84,7 @@
> PLIST_SUB+=	PCRE="@comment "
> .endif
> 
>-.if defined(WITH_GTK2)
>+.if ${PORT_OPTIONS:MGTK2}
> 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=
>@@ -140,24 +123,19 @@
> 	    ${WRKSRC}/src/tools/install.neko
> .endfor
> .endif
>-.if defined(WITH_APACHE13)
>+.if ${PORT_OPTIONS:MAPACHE}
> 	@${REINPLACE_CMD} \
>-	    -e 's,"/usr/include/apache-1.3","${PREFIX}/include/apache",' \
>-	    ${WRKSRC}/src/tools/install.neko
>-.endif
>-.if defined(WITH_APACHE22)
>-	@${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 +147,7 @@
> .endif
> 
> post-install:
>-.if defined(WITH_APACHE13) || defined(WITH_APACHE22)
>+.if ${PORT_OPTIONS:MAPACHE}
> 	@${ECHO_CMD}
> 	@${ECHO_CMD} "======================================================="
> 	@${ECHO_CMD}
>@@ -181,4 +159,4 @@
> 	@${ECHO_CMD}
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 170752: 126977