From owner-svn-ports-head@FreeBSD.ORG Sun Aug 3 14:27:12 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1D6367E for ; Sun, 3 Aug 2014 14:27:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADFAD2508 for ; Sun, 3 Aug 2014 14:27:12 +0000 (UTC) Received: from dinoex (uid 875) (envelope-from dinoex@FreeBSD.org) id 53ef by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 14:27:12 +0000 From: Dirk Meyer Date: Sun, 3 Aug 2014 14:27:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363905 - in head/x11-wm/afterstep: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de46c0.53ef.1b037d83@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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: Sun, 03 Aug 2014 14:27:12 -0000 Author: dinoex Date: Sun Aug 3 14:27:11 2014 New Revision: 363905 URL: http://svnweb.freebsd.org/changeset/ports/363905 QAT: https://qat.redports.org/buildarchive/r363905/ Log: - make HICOLOR_ICONS default - rename patch files Added: head/x11-wm/afterstep/files/patch-alpha_header.h - copied unchanged from r363792, head/x11-wm/afterstep/files/patch-afterstep__alpha_header.h head/x11-wm/afterstep/files/patch-icons.c - copied unchanged from r363792, head/x11-wm/afterstep/files/patch-afterstep__icons.c Deleted: head/x11-wm/afterstep/files/patch-afterstep__alpha_header.h head/x11-wm/afterstep/files/patch-afterstep__icons.c Modified: head/x11-wm/afterstep/Makefile Modified: head/x11-wm/afterstep/Makefile ============================================================================== --- head/x11-wm/afterstep/Makefile Sun Aug 3 14:15:08 2014 (r363904) +++ head/x11-wm/afterstep/Makefile Sun Aug 3 14:27:11 2014 (r363905) @@ -3,7 +3,7 @@ PORTNAME= afterstep PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm afterstep MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dinoex @@ -32,6 +32,7 @@ SRCDIRS= afterstep \ modules/Wharf/ASSound OPTIONS_DEFINE= HICOLOR_ICONS +OPTIONS_DEFAULT= HICOLOR_ICONS HICOLOR_ICONS_DESC= Use hi-color icons .include @@ -42,20 +43,20 @@ post-patch: ${WRKSRC}/configure.h \ ${WRKSRC}/sample.steprc @ for i in ${SRCDIRS}; do \ - cd ${WRKSRC}/$$i; \ + ( cd ${WRKSRC}/$$i; \ ${MV} Imakefile Imakefile.orig; \ - ${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig > Imakefile; \ + ${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig > Imakefile; ) \ done pre-build: - @ (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles) + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles) post-install: - @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/ ${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/ - @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/ ${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/ - @ ${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ + ${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ .if ${PORT_OPTIONS:MHICOLOR_ICONS} ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ ${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ @@ -66,7 +67,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/icons/eyecon.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/ .endif - @ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/ + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/ @for i in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/; \ done Copied: head/x11-wm/afterstep/files/patch-alpha_header.h (from r363792, head/x11-wm/afterstep/files/patch-afterstep__alpha_header.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-alpha_header.h Sun Aug 3 14:27:11 2014 (r363905, copy of r363792, head/x11-wm/afterstep/files/patch-afterstep__alpha_header.h) @@ -0,0 +1,14 @@ +--- afterstep/alpha_header.h.orig Thu Aug 22 20:48:18 1996 ++++ afterstep/alpha_header.h Mon Sep 13 14:35:09 2004 +@@ -7,11 +7,6 @@ + + extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); + +-/* string manipulation */ +-#ifdef __GNUC__ +-extern size_t strlen(char *); +-#endif +- + /* Commented out 08/22/96 -- Thanks to Pierre Wendling + extern int bzero(char *, int); + extern int gethostname (char *, int); Copied: head/x11-wm/afterstep/files/patch-icons.c (from r363792, head/x11-wm/afterstep/files/patch-afterstep__icons.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-icons.c Sun Aug 3 14:27:11 2014 (r363905, copy of r363792, head/x11-wm/afterstep/files/patch-afterstep__icons.c) @@ -0,0 +1,21 @@ +$FreeBSD: /tmp/pcvs/ports/x11-wm/afterstep/files/patch-icons.c,v 1.1 2005-10-24 14:19:00 dinoex Exp $ + +--- afterstep/icons.c.orig Thu Mar 20 19:09:21 1997 ++++ afterstep/icons.c Sun May 26 18:15:10 2002 +@@ -779,10 +779,12 @@ + } + } + +- if(tmp_win->flags & ICON_MOVED) +- CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc); +- else +- CreateIconWindow(tmp_win, def_x, def_y); ++ if(tmp_win->icon_pixmap_w == None) { ++ if(tmp_win->flags & ICON_MOVED) ++ CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc); ++ else ++ CreateIconWindow(tmp_win, def_x, def_y); ++ } + + AutoPlace(tmp_win); + tmp_win->flags |= ICONIFIED;