Attachment #112684 for bug #154128

View | Details | Raw Unified | Return to bug 154128
Collapse All | Expand All




#

PORTNAME=	weechat
PORTVERSION=	20110118
CATEGORIES=	irc
MASTER_SITES=	http://perturb.me.uk/distfiles/
PKGNAMESUFFIX=	-devel
DISTNAME=	weechat-devel-ce4136312155a870febced831c02b10785bfb75d

MAINTAINER=	freebsd@beardz.net
COMMENT=	A lightweight and user friendly ncurse based IRC client

		NLS		"NLS support."			On	\
		DOCUMENTATION	"Build documentation."		Off

WRKSRC=	${WRKDIR}/${PORTNAME}-ce41363

.include <bsd.port.options.mk>



MAN1=	weechat-curses.1

post-extract:
	@${CP} ${WRKSRC}/doc/weechat-curses.1 ${WRKSRC}/

post-patch:
	@${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} -e 's|INSTALL|#INSTALL|' ${WRKSRC}/doc/CMakeLists.txt

Lines 1-2 Link Here

(-)/usr/ports/irc/weechat-devel/distinfo (-2 / +2 lines)
1	SHA256 (weechat-devel-fd764a369c138d0399a1476e5c03a1e482c05f25.tar.gz) = dee51197eabd3c15b132a11ca27679503489a93f52c26fcba9712bcab2536e00	1	SHA256 (weechat-devel-ce4136312155a870febced831c02b10785bfb75d.tar.gz) = 6e88e065204997dbb4d75814a4483cad18076d44cedd9f45fb5bcfc6f7e3c450
2	SIZE (weechat-devel-fd764a369c138d0399a1476e5c03a1e482c05f25.tar.gz) = 1682431	2	SIZE (weechat-devel-ce4136312155a870febced831c02b10785bfb75d.tar.gz) = 1692359




--- cmake/FindRuby.cmake.orig	2011-01-18 19:54:43.825973597 +0000
+++ cmake/FindRuby.cmake	2011-01-18 19:57:33.943672013 +0000
@@ -32,13 +32,12 @@
 ENDIF(RUBY_FOUND)
 
 FIND_PROGRAM(RUBY_EXECUTABLE
-  NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+  NAMES ${BSD_RUBY_CMD}
   )

     "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
 
   FIND_LIBRARY(RUBY_LIBRARY
-    NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+    NAMES ${BSD_RUBY_VER}
     PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
     )

Return to bug 154128

Lines 6-16 Link Here

(-)/usr/ports/irc/weechat-devel/Makefile (-6 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= weechat	8	PORTNAME= weechat
9	PORTVERSION= 20110104	9	PORTVERSION= 20110118
10	CATEGORIES= irc	10	CATEGORIES= irc
11	MASTER_SITES= http://perturb.me.uk/distfiles/	11	MASTER_SITES= http://perturb.me.uk/distfiles/
12	PKGNAMESUFFIX= -devel	12	PKGNAMESUFFIX= -devel
13	DISTNAME= weechat-devel-fd764a369c138d0399a1476e5c03a1e482c05f25	13	DISTNAME= weechat-devel-ce4136312155a870febced831c02b10785bfb75d
14		14
15	MAINTAINER= freebsd@beardz.net	15	MAINTAINER= freebsd@beardz.net
16	COMMENT= A lightweight and user friendly ncurse based IRC client	16	COMMENT= A lightweight and user friendly ncurse based IRC client
Lines 37-43 Link Here
37	NLS "NLS support." On \	37	NLS "NLS support." On \
38	DOCUMENTATION "Build documentation." Off	38	DOCUMENTATION "Build documentation." Off
39		39
40	WRKSRC= ${WRKDIR}/${PORTNAME}-fd764a3	40	WRKSRC= ${WRKDIR}/${PORTNAME}-ce41363
41		41
42	.include <bsd.port.options.mk>	42	.include <bsd.port.options.mk>
43		43
Lines 140-148 Link Here
140		140
141	MAN1= weechat-curses.1	141	MAN1= weechat-curses.1
142		142
143	post-extract:
144	@${CP} ${WRKSRC}/doc/weechat-curses.1 ${WRKSRC}/
145
146	post-patch:	143	post-patch:
147	@${REINPLACE_CMD} -e 's\|$${LIBDIR}/../pkgconfig\|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt	144	@${REINPLACE_CMD} -e 's\|$${LIBDIR}/../pkgconfig\|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig\|' ${WRKSRC}/CMakeLists.txt
148	@${REINPLACE_CMD} -e 's\|INSTALL\|#INSTALL\|' ${WRKSRC}/doc/CMakeLists.txt	145	@${REINPLACE_CMD} -e 's\|INSTALL\|#INSTALL\|' ${WRKSRC}/doc/CMakeLists.txt

Lines 1-10 Link Here

(-)/usr/ports/irc/weechat-devel/files/patch-cmake-FindRuby_cmake (-4 / +4 lines)
1	--- cmake/FindRuby.cmake.orig 2010-12-10 15:13:27.000000000 +0000	1	--- cmake/FindRuby.cmake.orig 2011-01-18 19:54:43.825973597 +0000
2	+++ cmake/FindRuby.cmake 2010-12-12 03:10:20.000000000 +0000	2	+++ cmake/FindRuby.cmake 2011-01-18 19:57:33.943672013 +0000
3	@@ -32,13 +32,12 @@	3	@@ -32,13 +32,12 @@
4	ENDIF(RUBY_FOUND)	4	ENDIF(RUBY_FOUND)
5		5
6	FIND_PROGRAM(RUBY_EXECUTABLE	6	FIND_PROGRAM(RUBY_EXECUTABLE
7	- NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16	7	- NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
8	- PATHS /usr/bin /usr/local/bin /usr/pkg/bin	8	- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
9	+ NAMES ${BSD_RUBY_CMD}	9	+ NAMES ${BSD_RUBY_CMD}
10	)	10	)
Lines 35-41 Link Here
35	"${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")	35	"${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
36		36
37	FIND_LIBRARY(RUBY_LIBRARY	37	FIND_LIBRARY(RUBY_LIBRARY
38	- NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19	38	- NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
39	+ NAMES ${BSD_RUBY_VER}	39	+ NAMES ${BSD_RUBY_VER}
40	PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}	40	PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
41	)	41	)