1 files changed, 34 insertions, 39 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 04f30f23f3bb..b13a1875a6d2 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.30
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -38,90 +39,84 @@ OPTIONS=	GNOMEDESKTOP	"Enable GNOME desktop support"		off \
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomedesktop}!="" || defined(WITH_GNOMEDESKTOP)
+.if defined(WITH_GNOMEDESKTOP)
 USE_GNOME+=	gnomedesktop
-CONFIGURE_ARGS+=	--enable-menus-gnome2
-INSTALL_TARGET=		install install-gnome
+CONFIGURE_ARGS+=--enable-menus-gnome2
+INSTALL_TARGET=	install install-gnome
 PLIST_SUB+=	GNOMEDESKTOP=""
-PKGNAMESUFFIX=	-gnome
 .else
 PLIST_SUB+=	GNOMEDESKTOP="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mimlib}!="" || defined(WITH_IMLIB)
+.if !defined(WITHOUT_IMLIB)
 USE_GNOME+=	imlib
-CONFIGURE_ARGS+=	--with-imlib
+CONFIGURE_ARGS+=--with-imlib
 .else
 USE_XPM=	yes
-CONFIGURE_ARGS+=	--without-imlib
+CONFIGURE_ARGS+=--without-imlib
 .endif
 
-.if ${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)
+.if defined(WITH_ESOUND)
 USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--with-icesound=esound
+CONFIGURE_ARGS+=--with-icesound=esound
 .else
-CONFIGURE_ARGS+=	--with-icesound=oss
+CONFIGURE_ARGS+=--with-icesound=oss
 .endif
 
-.if defined(WITHOUT_XFT)
-CONFIGURE_ARGS+=	--enable-corefonts --disable-xfreetype
-.else
+.if !defined(WITHOUT_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-CONFIGURE_ARGS+=	--enable-gradients
+CONFIGURE_ARGS+=--enable-gradients
+.else
+CONFIGURE_ARGS+=--enable-corefonts --disable-xfreetype
 .endif
 
 .if defined(WITHOUT_XINERAMA)
-CONFIGURE_ARGS+=	--disable-xinerama
+CONFIGURE_ARGS+=--disable-xinerama
 .endif
 
 .if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM)
-CONFIGURE_ARGS+=	--disable-x86-asm
+CONFIGURE_ARGS+=--disable-x86-asm
 .endif
 
 .if defined(WITH_BEASTIE)
-STARTUP_PIXMAP=		${DATADIR}/taskbar/bsd-daemon.xpm
+STARTUP_PIXMAP=	${DATADIR}/taskbar/bsd-daemon.xpm
 .else
-STARTUP_PIXMAP=		icewm-logo.xpm
+STARTUP_PIXMAP=	icewm-logo.xpm
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls --disable-i18n
-PLIST_SUB+=	NLS="@comment "
-.else
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls --disable-i18n
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/lib/taskbar && ${MV} start.xpm icewm-logo.xpm
-.for dir in Infadel2
-	@cd ${WRKSRC}/lib/themes/${dir}/taskbar && ${MV} start.xpm icewm-logo.xpm
+.for dir in taskbar themes/Infadel2/taskbar
+	@cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm
 .endfor
 	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
 post-patch:
-.for file in configure
-	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/${file}
-.endfor
-.for file in src/gnome2.cc
+	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \
 		 s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \
-		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' ${WRKSRC}/${file}
-.endfor
+		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
+		 ${WRKSRC}/src/gnome2.cc
 
 post-install:
-	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/taskbar/start.xpm
-.for dir in Infadel2
-	@${LN} -sf ${STARTUP_PIXMAP} \
-		${DATADIR}/themes/${dir}/taskbar/start.xpm
+.for dir in taskbar themes/Infadel2/taskbar
+	@${LN} -sf ${STARTUP_PIXMAP} ${DATADIR}/${dir}/start.xpm
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in CHANGES INSTALL README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}
+. for f in CHANGES INSTALL README TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+. endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 .endif
+	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.post.mk>