Date: Mon, 8 Apr 2002 12:49:52 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/36897: Update port: x11-wm/aewm Message-ID: <200204081949.g38Jnqq23788@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 36897
>Category: ports
>Synopsis: Update port: x11-wm/aewm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 08 12:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix install error when HAVE_GTK is not defined
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/aewm/Makefile x11-wm/aewm/Makefile
--- /usr/ports/x11-wm/aewm/Makefile Sun Mar 17 18:55:29 2002
+++ x11-wm/aewm/Makefile Tue Apr 9 04:47:37 2002
@@ -12,6 +12,7 @@
MAINTAINER= trevor@FreeBSD.org
+ALL_TARGET= aewm
GTKCLIENTS= aemenu-gtk aepanel-gtk
XAWCLIENTS= set-gnome-pda \
aesession \
@@ -27,14 +28,11 @@
WANT_GTK= yes
.include <bsd.port.pre.mk>
+
.if defined(HAVE_GTK)
USE_GTK=yes
.endif
-.if !defined(HAVE_GTK)
-ALL_TARGET= aewm
-.endif
-
do-patch:
${PERL} -pi -e 's:/etc/X11/aewm/aewmrc:${PREFIX}/etc/aewmrc:g' \
${WRKSRC}/aewm.h
@@ -46,6 +44,15 @@
${WRKSRC}/clients/lib/aeclients.h
.endif
+post-build:
+.if defined(HAVE_GTK)
+ @cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
+ ${GTKCLIENTS} ${XAWCLIENTS}
+.else
+ @cd ${WRKSRC}/clients && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
+ ${XAWCLIENTS}
+.endif
+
pre-install:
${RM} -f ${PLIST}
.for i in aewm aemenu aepanel ${XAWCLIENTS}
@@ -78,15 +85,13 @@
.for i in ${GTKCLIENTS}
${INSTALL_PROGRAM} ${WRKSRC}/clients/${i} ${PREFIX}/bin
.endfor
-.if defined(HAVE_GTK)
- 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}
-.endif
${INSTALL_DATA} ${WRKSRC}/aewmrc.sample ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/aewmrc.sample ${PREFIX}/etc/aewmrc
${INSTALL_DATA} ${WRKSRC}/clients/clientsrc.sample \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204081949.g38Jnqq23788>