[Midnightbsd-cvs] mports [20427] trunk/www/w3m: fix w3m build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 3 15:44:02 EDT 2015 

Revision: 20427
          http://svnweb.midnightbsd.org/mports/?rev=20427
Author:   laffer1
Date:     2015-10-03 15:44:02 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
fix w3m build

Modified Paths:
--------------
    trunk/www/w3m/Makefile
    trunk/www/w3m/pkg-plist

Added Paths:
-----------
    trunk/www/w3m/files/patch-terms.c

Modified: trunk/www/w3m/Makefile
===================================================================
--- trunk/www/w3m/Makefile	2015-10-03 19:40:05 UTC (rev 20426)
+++ trunk/www/w3m/Makefile	2015-10-03 19:44:02 UTC (rev 20427)
@@ -2,6 +2,7 @@
 
 PORTNAME=	w3m
 PORTVERSION=	0.5.3
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	SF/w3m/w3m/w3m-${PORTVERSION}
 
@@ -11,76 +12,48 @@
 LICENSE=	unknown
 
 USE_OPENSSL=	yes
-LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gc=${LOCALBASE}
+CONFIGURE_ARGS=	--with-gc=${LOCALBASE} \
+		ac_cv_path_PERL=${PERL}
+CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
 
-MAN1=		w3m.1 w3mman.1
-MANLANG=	"" ja
 
 DOCS=		FAQ.html HISTORY MANUAL.html README \
-		README.dict README.func STORY.html keymap.default \
-		keymap.lynx menu.default menu.submenu
+		README.dict README.func README.img README.m17n STORY.html \
+		keymap.default keymap.lynx menu.default menu.submenu
+DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.img \
+		README.mailcap README.menu README.migemo
 
-.if !defined(MASTERDIR)
-OPTIONS_DEFINE=	M17N JAPANESE INLINE_IMAGE KEY_LYNX DOCS
-M17N_DESC=		Multilingualization support
+OPTIONS_DEFINE=	JAPANESE INLINE_IMAGE KEY_LYNX DOCS
 JAPANESE_DESC=		Japanese messages and migemo support
 INLINE_IMAGE_DESC=	Inline image support
 KEY_LYNX_DESC=		Keymap like lynx browser
-.endif
+OPTIONS_SUB=	yes
 
-.include <bsd.mport.options.mk>
+JAPANESE_USES=	gettext
+JAPANESE_CONFIGURE_ON=	--enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
+JAPANESE_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MM17N}
-CONFIGURE_ARGS+=	--enable-m17n
-PLIST_SUB+=	M17N=""
-.else
-.if ! ${PORT_OPTIONS:MJAPANESE}
-CONFIGURE_ARGS+=	--disable-m17n
-PLIST_SUB+=	M17N="@comment "
-.endif
-.endif
+INLINE_IMAGE_USE=	gnome=gtk20
+INLINE_IMAGE_CONFIGURE_ON=	--with-imagelib=gtk2 --enable-image=fb,x11
+INLINE_IMAGE_CONFIGURE_OFF=	--enable-image=no
 
-.if ${PORT_OPTIONS:MJAPANESE}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-m17n --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
-DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
-		README.menu README.migemo
+KEY_LYNX_CONFIGURE_ON=	--with-keymap=lynx
 
-PLIST_SUB+=	JAPANESE="" M17N=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	JAPANESE="@comment "
-.endif
+.include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MINLINE_IMAGE}
-USE_GNOME=	gtk20
-CONFIGURE_ARGS+=	--with-imagelib=gtk2 --enable-image=fb,x11
-
-DOCS+=		README.img
-DOCS_JP+=	README.img
-PLIST_SUB+=	INLINE_IMAGE=""
-
 PKGMESSAGE=	${MASTERDIR}/pkg-message
+CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lX11"
 .else
-CONFIGURE_ARGS+=	--enable-image=no
-PLIST_SUB+=	INLINE_IMAGE="@comment "
-
 # Don't use pkg-message
 PKGMESSAGE=	${NONEXISTENT}
 .endif
 
-.if ${PORT_OPTIONS:MKEY_LYNX}
-CONFIGURE_ARGS+=	--enable-keymap=lynx
-.endif
-
-CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\`\(expr\) \(.*\) : \(.*\)`|`\1 \\( \2 : \3 \\)`|' \
@@ -90,23 +63,16 @@
 		-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-.if ${PORT_OPTIONS:MJAPANESE}
-	@${MKDIR} ${PREFIX}/share/doc/ja/w3m
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m
 	@cd ${WRKSRC}/doc-jp; \
 	for i in ${DOCS_JP} ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/ja/w3m/ ; \
+		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \
 	done
-.endif
 	@cd ${WRKSRC}/doc; \
-	${MKDIR} ${PREFIX}/share/doc/w3m/; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \
 	for i in ${DOCS} ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
+		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \
 	done
-.if ${PORT_OPTIONS:MM17N} || ${PORT_OPTIONS:MJAPANESE}
-	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
-.endif
-.endif
-	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
+	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1
 
 .include <bsd.port.mk>

Added: trunk/www/w3m/files/patch-terms.c
===================================================================
--- trunk/www/w3m/files/patch-terms.c	                        (rev 0)
+++ trunk/www/w3m/files/patch-terms.c	2015-10-03 19:44:02 UTC (rev 20427)
@@ -0,0 +1,11 @@
+--- terms.c.orig	2015-10-03 15:40:58.884853339 -0400
++++ terms.c	2015-10-03 15:41:34.978245408 -0400
+@@ -26,7 +26,7 @@
+ #endif				/* USE_GPM */
+ #ifdef USE_SYSMOUSE
+ #include <osreldate.h>
+-#if (__FreeBSD_version >= 400017) || (__FreeBSD_kernel_version >= 400017)
++#if defined(__MidnightBSD__) || (__FreeBSD_version >= 400017) || (__FreeBSD_kernel_version >= 400017)
+ #include <sys/consio.h>
+ #include <sys/fbio.h>
+ #else


Property changes on: trunk/www/w3m/files/patch-terms.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/w3m/pkg-plist
===================================================================
--- trunk/www/w3m/pkg-plist	2015-10-03 19:40:05 UTC (rev 20426)
+++ trunk/www/w3m/pkg-plist	2015-10-03 19:44:02 UTC (rev 20427)
@@ -35,7 +35,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.dict
 %%PORTDOCS%%%%DOCSDIR%%/README.func
 %%PORTDOCS%%%%INLINE_IMAGE%%%%DOCSDIR%%/README.img
-%%PORTDOCS%%%%M17N%%%%DOCSDIR%%/README.m17n
+%%PORTDOCS%%%%DOCSDIR%%/README.m17n
 %%PORTDOCS%%%%DOCSDIR%%/STORY.html
 %%PORTDOCS%%%%DOCSDIR%%/keymap.default
 %%PORTDOCS%%%%DOCSDIR%%/keymap.lynx

More information about the Midnightbsd-cvs mailing list