Date: Thu, 14 Mar 2019 20:53:32 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495736 - in head: net/wmnetload net/wmnetload/files x11-wm/libdockapp x11/xscreensaver.app x11/xscreensaver.app/files Message-ID: <201903142053.x2EKrWiF012699@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Thu Mar 14 20:53:31 2019 New Revision: 495736 URL: https://svnweb.freebsd.org/changeset/ports/495736 Log: x11-wm/libdockapp: Update to 0.7.2 While I'm here: * Change MASTER_SITES to upstream's new location * Add license and path to the license file * Sort variables a bit according to the PHB * Simplify pkg-plist substitution for the installation of example files Add some patches as well as just bumping the port revision for the following ports due changed location of the header files: * net/wmnetload * x11/xscreensaver.app Changelog: https://github.com/d-torrance/dockapps/blob/master/libdockapp/ChangeLog PR: 235923 Approved by: miwi (mentor), maintainer timeout Differential Revision: https://reviews.freebsd.org/D19508 Added: head/net/wmnetload/files/ head/net/wmnetload/files/patch-configure (contents, props changed) head/net/wmnetload/files/patch-src_wmnetload.c (contents, props changed) head/x11/xscreensaver.app/files/ head/x11/xscreensaver.app/files/patch-xscreensaver.app.c (contents, props changed) Modified: head/net/wmnetload/Makefile head/x11-wm/libdockapp/Makefile head/x11-wm/libdockapp/distinfo head/x11-wm/libdockapp/pkg-plist head/x11/xscreensaver.app/Makefile Modified: head/net/wmnetload/Makefile ============================================================================== --- head/net/wmnetload/Makefile Thu Mar 14 20:51:00 2019 (r495735) +++ head/net/wmnetload/Makefile Thu Mar 14 20:53:31 2019 (r495736) @@ -3,7 +3,7 @@ PORTNAME= wmnetload PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net windowmaker afterstep MASTER_SITES= ftp://truffula.com/pub/ \ http://dl.fkb.wormulon.net/wmnetload/ \ Added: head/net/wmnetload/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wmnetload/files/patch-configure Thu Mar 14 20:53:31 2019 (r495736) @@ -0,0 +1,20 @@ +--- configure.orig 2003-02-23 09:08:00 UTC ++++ configure +@@ -4713,7 +4713,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <dockapp.h> ++#include <libdockapp/dockapp.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -4748,7 +4748,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <dockapp.h> ++#include <libdockapp/dockapp.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 Added: head/net/wmnetload/files/patch-src_wmnetload.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/wmnetload/files/patch-src_wmnetload.c Thu Mar 14 20:53:31 2019 (r495736) @@ -0,0 +1,11 @@ +--- src/wmnetload.c.orig 2003-02-23 09:07:17 UTC ++++ src/wmnetload.c +@@ -37,7 +37,7 @@ + #include <sys/ioctl.h> + #include <sys/time.h> + #include <unistd.h> +-#include <dockapp.h> ++#include <libdockapp/dockapp.h> + #ifdef HAVE_SYS_SOCKIO_H + #include <sys/sockio.h> + #endif Modified: head/x11-wm/libdockapp/Makefile ============================================================================== --- head/x11-wm/libdockapp/Makefile Thu Mar 14 20:51:00 2019 (r495735) +++ head/x11-wm/libdockapp/Makefile Thu Mar 14 20:53:31 2019 (r495736) @@ -2,26 +2,32 @@ # $FreeBSD$ PORTNAME= libdockapp -PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTVERSION= 0.7.2 CATEGORIES= x11-wm -MASTER_SITES= LOCAL/xride +MASTER_SITES= https://www.dockapps.net/download/ MAINTAINER= xride@FreeBSD.org COMMENT= Standard library for Window Maker dock apps -OPTIONS_DEFINE= EXAMPLES -OPTIONS_SUB= yes +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING -USES= libtool fonts tar:bzip2 +BUILD_DEPENDS= mkfontdir:x11-fonts/mkfontscale + +USES= autoreconf fonts libtool pkgconfig USE_LDCONFIG= yes -USE_XORG= xext xpm +USE_XORG= fontutil x11 xext xpm + GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-font --without-examples +WRKSRC= ${WRKDIR}/dockapps-b9baa8f + +OPTIONS_DEFINE= EXAMPLES + post-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} -.for file in fonts.alias *.pcf.gz +.for file in *.pcf.gz ${INSTALL_DATA} ${WRKSRC}/fonts/${file} ${STAGEDIR}${FONTSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -29,11 +35,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${STAGEDIR}${EXAMPLESDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/basic -.for file in Imakefile README *.c *.xpm +.for file in README *.c *.xpm ${INSTALL_DATA} ${WRKSRC}/examples/basic/${file} ${STAGEDIR}${EXAMPLESDIR}/basic .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/rectangles -.for file in Imakefile *.c +.for file in *.c ${INSTALL_DATA} ${WRKSRC}/examples/rectangles/${file} ${STAGEDIR}${EXAMPLESDIR}/rectangles .endfor Modified: head/x11-wm/libdockapp/distinfo ============================================================================== --- head/x11-wm/libdockapp/distinfo Thu Mar 14 20:51:00 2019 (r495735) +++ head/x11-wm/libdockapp/distinfo Thu Mar 14 20:53:31 2019 (r495736) @@ -1,2 +1,3 @@ -SHA256 (libdockapp-0.6.2.tar.bz2) = b0a262031342a2e0ac4e5487ffe9071ace4234899022488ec90111241f24b601 -SIZE (libdockapp-0.6.2.tar.bz2) = 540677 +TIMESTAMP = 1549754883 +SHA256 (libdockapp-0.7.2.tar.gz) = df7a24f32a70b878bf280f0754529335ffa3bac44bf7a59cd1277f5cf13f4264 +SIZE (libdockapp-0.7.2.tar.gz) = 39434 Modified: head/x11-wm/libdockapp/pkg-plist ============================================================================== --- head/x11-wm/libdockapp/pkg-plist Thu Mar 14 20:51:00 2019 (r495735) +++ head/x11-wm/libdockapp/pkg-plist Thu Mar 14 20:53:31 2019 (r495736) @@ -1,15 +1,16 @@ -include/dockapp.h +include/libdockapp/dockapp.h +include/libdockapp/list.h +include/libdockapp/misc.h +include/libdockapp/wmgeneral.h lib/libdockapp.a lib/libdockapp.so -lib/libdockapp.so.2 -lib/libdockapp.so.2.0.0 -%%FONTSDIR%%/fonts.alias +lib/libdockapp.so.3 +lib/libdockapp.so.3.0.0 +libdata/pkgconfig/dockapp.pc %%FONTSDIR%%/luxel-ascii-06x09.pcf.gz %%FONTSDIR%%/seg7-ascii-05x07.pcf.gz -%%EXAMPLES%%%%EXAMPLESDIR%%/README -%%EXAMPLES%%%%EXAMPLESDIR%%/basic/Imakefile -%%EXAMPLES%%%%EXAMPLESDIR%%/basic/README -%%EXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm -%%EXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c -%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/Imakefile -%%EXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/ball_red.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/basic.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangles/rectangles.c Modified: head/x11/xscreensaver.app/Makefile ============================================================================== --- head/x11/xscreensaver.app/Makefile Thu Mar 14 20:51:00 2019 (r495735) +++ head/x11/xscreensaver.app/Makefile Thu Mar 14 20:53:31 2019 (r495736) @@ -3,7 +3,7 @@ PORTNAME= XScreenSaver.App PORTVERSION= 2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 windowmaker MASTER_SITES= SF/xscreensaverapp/${PORTNAME}/${PORTVERSION} Added: head/x11/xscreensaver.app/files/patch-xscreensaver.app.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xscreensaver.app/files/patch-xscreensaver.app.c Thu Mar 14 20:53:31 2019 (r495736) @@ -0,0 +1,11 @@ +--- xscreensaver.app.c.orig 2003-05-30 01:36:59 UTC ++++ xscreensaver.app.c +@@ -16,7 +16,7 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include <dockapp.h> ++#include <libdockapp/dockapp.h> + #include <unistd.h> + #include <stdio.h> + #include <ctype.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903142053.x2EKrWiF012699>