[Midnightbsd-cvs] mports [17477] trunk/irc/xchat/pkg-plist: modernize xchat

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 23 23:23:22 EDT 2014 

Revision: 17477
          http://svnweb.midnightbsd.org/mports/?rev=17477
Author:   laffer1
Date:     2014-09-23 23:23:21 -0400 (Tue, 23 Sep 2014)
Log Message:
-----------
modernize xchat

Modified Paths:
--------------
    trunk/irc/xchat/Makefile
    trunk/irc/xchat/pkg-descr
    trunk/irc/xchat/pkg-plist

Added Paths:
-----------
    trunk/irc/xchat/files/patch-src_version-script

Property Changed:
----------------
    trunk/irc/xchat/pkg-descr

Modified: trunk/irc/xchat/Makefile
===================================================================
--- trunk/irc/xchat/Makefile	2014-09-24 03:19:18 UTC (rev 17476)
+++ trunk/irc/xchat/Makefile	2014-09-24 03:23:21 UTC (rev 17477)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	2.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	SF/${PORTNAME}/ \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -11,18 +11,17 @@
 COMMENT=	X11 IRC client using the GTK+ 2 toolkit
 
 LICENSE=	gpl2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext
-USE_GNOME=	gnomehack gtk20
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-ipv6
-WANT_PERL=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DBUS NOTIFY PERL PYTHON SOCKS TCL
 OPTIONS_DEFAULT=DBUS GTKSPELL PERL
@@ -31,13 +30,10 @@
 GTKSPELL_DESC=	Spell check support via gtkspell
 LIBSEXY_DESC=	Spell check support via libsexy
 
-.if defined(WITH_PYTHON)
-.endif
-
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 USE_GNOME+=	gconf2
 GCONF_SCHEMAS+=	apps_xchat_url_handler.schemas
@@ -48,10 +44,10 @@
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--enable-spell=gtkspell
 .elif ${PORT_OPTIONS:MLIBSEXY}
-LIB_DEPENDS+=	sexy:${PORTSDIR}/x11-toolkits/libsexy
+LIB_DEPENDS+=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
 CONFIGURE_ARGS+=--enable-spell=libsexy
 .else
 CONFIGURE_ARGS+=--enable-spell=none
@@ -81,17 +77,15 @@
 .endif
 
 .if ${PORT_OPTIONS:MSOCKS}
-LIB_DEPENDS+=	socks:${PORTSDIR}/net/dante
+LIB_DEPENDS+=	libsocks.so:${PORTSDIR}/net/dante
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
-USE_TCL=	84+
+USES+=		tcl
 CONFIGURE_ARGS+=--enable-tcl=${TCL_LIBDIR}
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-		-L${TCL_LIBDIR}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${TCL_INCLUDEDIR}
+CPPFLAGS+=	-I${TCL_INCLUDEDIR}
+LIBS+=		-L${TCL_LIBDIR}
 PLIST_SUB+=	TCL=""
 .else
 CONFIGURE_ARGS+=--enable-tcl=no
@@ -99,13 +93,14 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/common/*.[ch]
+	@${REINPLACE_CMD} '/_LDADD =/s/$$/ -lgmodule-2.0/' \
+		${WRKSRC}/src/fe-gtk/Makefile.in \
+		${WRKSRC}/src/fe-text/Makefile.in
 
 # Create plugins directory even when no plugins are installed
 post-install:
-	@${MKDIR} ${PREFIX}/lib/xchat/plugins
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
 
 .include <bsd.port.mk>

Added: trunk/irc/xchat/files/patch-src_version-script
===================================================================
--- trunk/irc/xchat/files/patch-src_version-script	                        (rev 0)
+++ trunk/irc/xchat/files/patch-src_version-script	2014-09-24 03:23:21 UTC (rev 17477)
@@ -0,0 +1,10 @@
+--- src/version-script.orig	2009-08-16 11:40:18.000000000 +0200
++++ src/version-script	2014-06-05 22:18:13.000000000 +0200
+@@ -30,5 +30,7 @@
+ 		xchat_send_modes;
+ 		xchat_strip;
+ 		xchat_free;
++		__progname;
++		environ;
+ 	local: *;
+ };


Property changes on: trunk/irc/xchat/files/patch-src_version-script
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/irc/xchat/pkg-descr
===================================================================
--- trunk/irc/xchat/pkg-descr	2014-09-24 03:19:18 UTC (rev 17476)
+++ trunk/irc/xchat/pkg-descr	2014-09-24 03:23:21 UTC (rev 17477)
@@ -2,4 +2,4 @@
 UNIX-like OS and the X Window System (X11), and the GTK 2 library.  It can
 also use Perl and (optionally) Python scripts.
 
-WWW:	http://xchat.org/
+WWW: http://xchat.org/


Property changes on: trunk/irc/xchat/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/irc/xchat/pkg-plist
===================================================================
--- trunk/irc/xchat/pkg-plist	2014-09-24 03:19:18 UTC (rev 17476)
+++ trunk/irc/xchat/pkg-plist	2014-09-24 03:23:21 UTC (rev 17477)
@@ -1,9 +1,6 @@
 bin/xchat
-%%PERL%%lib/xchat/plugins/perl.la
 %%PERL%%lib/xchat/plugins/perl.so
-%%PYTHON%%lib/xchat/plugins/python.la
 %%PYTHON%%lib/xchat/plugins/python.so
-%%TCL%%lib/xchat/plugins/tcl.la
 %%TCL%%lib/xchat/plugins/tcl.so
 share/applications/xchat.desktop
 %%DBUS%%share/dbus-1/services/org.xchat.service.service
@@ -37,7 +34,6 @@
 share/locale/zh_CN/LC_MESSAGES/xchat.mo
 share/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
- at dirrmtry share/applications
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat

More information about the Midnightbsd-cvs mailing list