Update to 1.2.7.

PR:		ports/93243
Submitted by:	Ports Fury

4 files changed, 66 insertions, 64 deletions

diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index 6fba3a78fcbb..58cf6e09b0a8 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -6,47 +6,46 @@
 #
 
 PORTNAME=	aewm
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTVERSION=	1.2.7
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.red-bean.com/~decklin/aewm/
+MASTER_SITES=	http://www.red-bean.com/~decklin/software/aewm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICCCM-compliant window manager based on 9wm
 
-GTKCLIENTS=	aemenu-gtk aepanel-gtk
-XAWCLIENTS=	set-gnome-pda \
-		aesession \
-		aemenu-xaw \
-		aepanel-xaw
-DOCDIR=		share/doc/${PORTNAME}
-DOCS=		ChangeLog README TODO DESIGN LICENSE
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}"
-MAN1=		aewm.1 aeclients.1
-PLIST=		${WRKDIR}/pkg-plist
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_REINPLACE=	yes
-REINPLACE_ARGS=	-i '' -E
+USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}"
+
+MAN1=		aeclients.1 aewm.1
+
+GTKCLIENTS=	aemenu-gtk aepanel-gtk
+XAWCLIENTS=	aemenu-xaw aepanel-xaw aesession set-gnome-pda
 
 .include <bsd.port.pre.mk>
+
 .if ${HAVE_GNOME:Mgtk20}!=""
 USE_GNOME+=	gtk20
 PKGNAMESUFFIX=	-gtk
+.else
 .endif
 
-do-patch:
-	${REINPLACE_CMD} 's:/etc/X11/aewm/aewmrc:${PREFIX}/etc/aewmrc:g' \
-		${WRKSRC}/src/aewm.h
-	${REINPLACE_CMD} 's:clients::g' ${WRKSRC}/Makefile
-.if ${HAVE_GNOME:Mgtk20}!=""
-	${REINPLACE_CMD} 's:gtk-config:${GTK_CONFIG}:g' \
-		${WRKSRC}/clients/Makefile
-	${REINPLACE_CMD} 's:/etc/X11/aewm/clientsrc:${PREFIX}/etc/clientsrc:g' \
-		${WRKSRC}/clients/lib/aeclients.h
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
+.if defined(WITH_XFT)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+MAKE_ENV+=	DEFINES="-DXFT" \
+		EXTRA_INC="`pkg-config --cflags xft`" \
+		EXTRA_LIBS="`pkg-config --libs xft`"
+.endif
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIR/s|clients||g' ${WRKSRC}/Makefile
+.for i in clients/lib/aeclients.h src/aewm.h
+	@${REINPLACE_CMD} -e 's|/etc/X11/|${PREFIX}/etc/|g' ${WRKSRC}/${i}
+.endfor
+
 post-build:
 .if ${HAVE_GNOME:Mgtk20}!=""
 	cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
@@ -56,30 +55,7 @@ post-build:
 		${XAWCLIENTS}
 .endif
 
-pre-install:
-	${RM} -f ${PLIST}
-.for i in aewm aemenu aepanel ${XAWCLIENTS}
-	${ECHO_CMD} bin/${i} >> ${PLIST}
-.endfor
-.if ${HAVE_GNOME:Mgtk20}!=""
-.for i in ${GTKCLIENTS}
-	${ECHO_CMD} bin/${i} >> ${PLIST}
-.endfor
-.endif
-	${ECHO_CMD} share/examples/aewm/aewmrc.sample >> ${PLIST}
-	${ECHO_CMD} share/examples/aewm/clientsrc.sample >> ${PLIST}
-	${ECHO_CMD} etc/aewmrc >> ${PLIST}
-	${ECHO_CMD} etc/clientsrc >> ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
-	${ECHO_CMD} @dirrm share/examples/aewm >> ${PLIST}
-
 do-install:
-	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/aewm ${PREFIX}/bin
 .for i in ${XAWCLIENTS}
 	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
@@ -88,24 +64,28 @@ do-install:
 .for i in ${GTKCLIENTS}
 	${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
 .endfor
-	cd ${PREFIX}/bin && ${LN} -s aemenu-gtk aemenu && \
-		${LN} -s aepanel-gtk aepanel
+	${LN} -sf aemenu-gtk ${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-gtk ${PREFIX}/bin/aepanel
 .else
-	cd ${PREFIX}/bin && ${LN} -s aemenu-xaw aemenu && \
-		${LN} -s aepanel-xaw aepanel
+	${LN} -sf aemenu-xaw ${PREFIX}/bin/aemenu
+	${LN} -sf aepanel-xaw ${PREFIX}/bin/aepanel
 .endif
-	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${PREFIX}/etc/aewmrc
-	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample \
-		${PREFIX}/etc/clientsrc
 	${INSTALL_MAN} ${WRKSRC}/src/aewm.1x ${MANPREFIX}/man/man1/aewm.1
 	${INSTALL_MAN} ${WRKSRC}/clients/aeclients.1x \
 		${MANPREFIX}/man/man1/aeclients.1
+	@${MKDIR} ${PREFIX}/etc/aewm
+	${INSTALL_DATA} ${WRKSRC}/src/aewmrc.sample ${PREFIX}/etc/aewm
+	${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample ${PREFIX}/etc/aewm
+.if !exists(${PREFIX}/etc/aewm/aewmrc)
+	cd ${PREFIX}/etc/aewm && ${CP} aewmrc.sample aewmrc
+.endif
+.if !exists(${PREFIX}/etc/aewm/clientsrc)
+	cd ${PREFIX}/etc/aewm && ${CP} clientsrc.sample clientsrc
+.endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
+	@${MKDIR} ${DOCSDIR}
+.for i in DESIGN LICENSE NEWS README TODO
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-wm/aewm/distinfo b/x11-wm/aewm/distinfo
index 01d415cc3c9c..1759edd6005c 100644
--- a/x11-wm/aewm/distinfo
+++ b/x11-wm/aewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (aewm-1.2.3.tar.gz) = 94fa24a6b83652bdb9d802be8cfcf048
-SHA256 (aewm-1.2.3.tar.gz) = 5dcec7edd0983832fa72aed1167ceb17de6450a5e06a814e24de865ce3f56d68
-SIZE (aewm-1.2.3.tar.gz) = 40260
+MD5 (aewm-1.2.7.tar.gz) = f445b04de000b2f98861571694ae932f
+SHA256 (aewm-1.2.7.tar.gz) = d18c329228dd7f4d2b3cea5696c56c995dd1d0108d56e749426a9f27b8773373
+SIZE (aewm-1.2.7.tar.gz) = 41728
diff --git a/x11-wm/aewm/pkg-descr b/x11-wm/aewm/pkg-descr
index 233b1a526ab7..194f6d6528b2 100644
--- a/x11-wm/aewm/pkg-descr
+++ b/x11-wm/aewm/pkg-descr
@@ -8,6 +8,6 @@ and aepanel applets.  These provide a list of windows by title
 (vertically for aemenu, horizontally for aepanel) and a menu from
 which programs may be run.
 
-WWW:  http://www.red-bean.com/~decklin/aewm/
+WWW:  http://www.red-bean.com/~decklin/software/aewm/
 
 Trevor Johnson
diff --git a/x11-wm/aewm/pkg-plist b/x11-wm/aewm/pkg-plist
new file mode 100644
index 000000000000..1587aab5f570
--- /dev/null
+++ b/x11-wm/aewm/pkg-plist
@@ -0,0 +1,22 @@
+bin/aemenu
+%%GNOME:%%bin/aemenu-gtk
+bin/aemenu-xaw
+bin/aepanel
+%%GNOME:%%bin/aepanel-gtk
+bin/aepanel-xaw
+bin/aesession
+bin/aewm
+bin/set-gnome-pda
+@unexec if cmp -s %D/etc/aewm/aewmrc.sample %D/etc/aewm/aewmrc; then rm -f %D/etc/aewm/aewmrc; fi
+etc/aewm/aewmrc.sample
+@exec if [ ! -e %D/etc/aewm/aewmrc ]; then cp %D/etc/aewm/aewmrc.sample %D/etc/aewm/aewmrc; fi
+@unexec if cmp -s %D/etc/aewm/clientsrc.sample %D/etc/aewm/clientsrc; then rm -f %D/etc/aewm/clientsrc; fi
+etc/aewm/clientsrc.sample
+@exec if [ ! -e %D/etc/aewm/clientsrc ]; then cp %D/etc/aewm/clientsrc.sample %D/etc/aewm/clientsrc; fi
+%%PORTDOCS%%%%DOCSDIR%%/DESIGN
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry etc/aewm