From owner-svn-ports-head@FreeBSD.ORG Tue Dec 30 18:36:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD4D0A16; Tue, 30 Dec 2014 18:36:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8DC812CD5; Tue, 30 Dec 2014 18:36:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBUIaYqO082230; Tue, 30 Dec 2014 18:36:34 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBUIaXjO082221; Tue, 30 Dec 2014 18:36:33 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201412301836.sBUIaXjO082221@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Tue, 30 Dec 2014 18:36:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375843 - in head: . deskutils deskutils/xpad deskutils/xpad-current deskutils/xpad/files deskutils/xpad3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Dec 2014 18:36:34 -0000 Author: jgh Date: Tue Dec 30 18:36:31 2014 New Revision: 375843 URL: https://svnweb.freebsd.org/changeset/ports/375843 QAT: https://qat.redports.org/buildarchive/r375843/ Log: - rename deskutils/xpad-current to deskutils/xpad - update xpad to 4.5.0 - add documentation to installation - lessen dependency count by using smaller icon package - remove patches, as they were committed upstream (see Changelog) - adjust conflicts for deskutils/xpad3 Added: head/deskutils/xpad/ - copied from r375838, head/deskutils/xpad-current/ Deleted: head/deskutils/xpad-current/ head/deskutils/xpad/files/ Modified: head/MOVED head/deskutils/Makefile head/deskutils/xpad/Makefile head/deskutils/xpad/distinfo head/deskutils/xpad/pkg-plist head/deskutils/xpad3/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Tue Dec 30 18:28:32 2014 (r375842) +++ head/MOVED Tue Dec 30 18:36:31 2014 (r375843) @@ -7351,3 +7351,4 @@ games/secretmaryochronicles||2014-12-27| multimedia/ffmpeg24|multimedia/ffmpeg25|2014-12-27|ffmpeg upstream now points to 2.5.x series x11-wm/enlightenment-docs|x11-wm/e16-docs|2014-12-28|Renamed for better naming devel/py-checkmanifest|devel/py-check-manifest|2014-12-29|Use correct upstream PyPi name +deskutils/xpad-current|deskutils/xpad|2014-12-30|deskutils/xpad-current is ready for prime time Modified: head/deskutils/Makefile ============================================================================== --- head/deskutils/Makefile Tue Dec 30 18:28:32 2014 (r375842) +++ head/deskutils/Makefile Tue Dec 30 18:36:31 2014 (r375843) @@ -275,7 +275,7 @@ SUBDIR += xmdiary SUBDIR += xneur SUBDIR += xpad3 - SUBDIR += xpad-current + SUBDIR += xpad SUBDIR += xpostit SUBDIR += xpostitPlus SUBDIR += xrolo Modified: head/deskutils/xpad/Makefile ============================================================================== --- head/deskutils/xpad-current/Makefile Tue Dec 30 14:26:23 2014 (r375838) +++ head/deskutils/xpad/Makefile Tue Dec 30 18:36:31 2014 (r375843) @@ -2,23 +2,21 @@ # $FreeBSD$ PORTNAME= xpad -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= deskutils -MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/4.4/+download/ -PKGNAMESUFFIX= -current +MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/4.5/+download/ MAINTAINER= jgh@FreeBSD.org COMMENT= Virtual note-pad system for your X11 desktop LICENSE= GPLv3 -RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS= icons-tango>=0:${PORTSDIR}/x11-themes/icons-tango -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes -CONFLICTS_INSTALL= xpad-[0-9]* +CONFLICTS_INSTALL= xpad3-[0-9]* USE_XORG= x11 sm USE_GNOME= gtk30 intltool gtksourceview3 USES= pkgconfig gmake tar:bzip2 autoreconf @@ -26,6 +24,7 @@ INSTALLS_ICONS= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes +PORTDOCS= * NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls @@ -36,4 +35,10 @@ post-patch: @${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \ ${WRKSRC}/src/xpad-undo.c +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO THANKS + ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} +.endfor + .include Modified: head/deskutils/xpad/distinfo ============================================================================== --- head/deskutils/xpad-current/distinfo Tue Dec 30 14:26:23 2014 (r375838) +++ head/deskutils/xpad/distinfo Tue Dec 30 18:36:31 2014 (r375843) @@ -1,2 +1,2 @@ -SHA256 (xpad-4.4.0.tar.bz2) = 969a76c983af7b3e96ba70a78cb6bcb8c95ea6c687ec20c638cf3adc57b2904a -SIZE (xpad-4.4.0.tar.bz2) = 230308 +SHA256 (xpad-4.5.0.tar.bz2) = f870cefc92593febf266bb0f90ceb0feeb4af7eb1033625fca50933701a7b9e8 +SIZE (xpad-4.5.0.tar.bz2) = 1907957 Modified: head/deskutils/xpad/pkg-plist ============================================================================== --- head/deskutils/xpad-current/pkg-plist Tue Dec 30 14:26:23 2014 (r375838) +++ head/deskutils/xpad/pkg-plist Tue Dec 30 18:36:31 2014 (r375843) @@ -1,8 +1,8 @@ bin/xpad -lib/xpad/help/xpad-user-help.txt man/man1/xpad.1.gz share/applications/xpad.desktop share/icons/hicolor/scalable/apps/xpad.svg +%%DATADIR%%/help/xpad-user-help.txt %%NLS%%share/locale/af/LC_MESSAGES/xpad.mo %%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo %%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo Modified: head/deskutils/xpad3/Makefile ============================================================================== --- head/deskutils/xpad3/Makefile Tue Dec 30 18:28:32 2014 (r375842) +++ head/deskutils/xpad3/Makefile Tue Dec 30 18:36:31 2014 (r375843) @@ -16,7 +16,7 @@ LICENSE= GPLv3 OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -CONFLICTS_INSTALL= xpad-current-[0-9]* +CONFLICTS_INSTALL= xpad-[0-9]* USE_XORG= x11 sm USE_GNOME= gtk20 intltool