From 3a0a4614ab5d9335a6d29a1685845d6d4717ebc7 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Sun, 3 Aug 2014 14:27:11 +0000 Subject: - make HICOLOR_ICONS default - rename patch files --- x11-wm/afterstep/Makefile | 17 +++++++++-------- .../afterstep/files/patch-afterstep__alpha_header.h | 14 -------------- x11-wm/afterstep/files/patch-afterstep__icons.c | 21 --------------------- x11-wm/afterstep/files/patch-alpha_header.h | 14 ++++++++++++++ x11-wm/afterstep/files/patch-icons.c | 21 +++++++++++++++++++++ 5 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 x11-wm/afterstep/files/patch-afterstep__alpha_header.h delete mode 100644 x11-wm/afterstep/files/patch-afterstep__icons.c create mode 100644 x11-wm/afterstep/files/patch-alpha_header.h create mode 100644 x11-wm/afterstep/files/patch-icons.c (limited to 'x11-wm/afterstep') diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index 9bd18f22eb90..f463fe4a0f36 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -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 diff --git a/x11-wm/afterstep/files/patch-afterstep__alpha_header.h b/x11-wm/afterstep/files/patch-afterstep__alpha_header.h deleted file mode 100644 index 8b4260bcd8c0..000000000000 --- a/x11-wm/afterstep/files/patch-afterstep__alpha_header.h +++ /dev/null @@ -1,14 +0,0 @@ ---- 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); diff --git a/x11-wm/afterstep/files/patch-afterstep__icons.c b/x11-wm/afterstep/files/patch-afterstep__icons.c deleted file mode 100644 index 04bd11ae88a1..000000000000 --- a/x11-wm/afterstep/files/patch-afterstep__icons.c +++ /dev/null @@ -1,21 +0,0 @@ -$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; diff --git a/x11-wm/afterstep/files/patch-alpha_header.h b/x11-wm/afterstep/files/patch-alpha_header.h new file mode 100644 index 000000000000..8b4260bcd8c0 --- /dev/null +++ b/x11-wm/afterstep/files/patch-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); diff --git a/x11-wm/afterstep/files/patch-icons.c b/x11-wm/afterstep/files/patch-icons.c new file mode 100644 index 000000000000..04bd11ae88a1 --- /dev/null +++ b/x11-wm/afterstep/files/patch-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; -- cgit v1.2.3