Update to version 2.00.00

PR:		ports/72331
Submitted by:	Ports Fury
Approved by:	maintainer

x11-wm/afterstep-stable/Makefile

@@ -6,32 +6,49 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	1.8.11
+PORTVERSION=	2.00.00
 CATEGORIES=	x11-wm afterstep
-MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR=	stable
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	AfterStep-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A stable version of the AfterStep window manager
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		rplay.1:${PORTSDIR}/audio/rplay
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		png.5:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier gnometarget
+USE_PERL5=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--enable-i18n \
+		--disable-ascp \
+		--disable-send-postcard-to-developer \
+		--with-ungif \
 		--with-png-includes="${LOCALBASE}/include" \
 		--with-png-libs="${LOCALBASE}/lib" \
 		--with-jpeg-includes="${LOCALBASE}/include" \
 		--with-jpeg-libs="${LOCALBASE}/lib" \
 		--with-helpcommand="xterm -e man"
+MAKE_ENV=	INCS_PRIVATE="${CPPFLAGS}" LIBS_PRIVATE="${LDFLAGS}"
+
+MAN1=		ASDatabase.1x ASDatabaseEntry.1x AfterStep.1x Align.1x \
+		Animate.1x AnimateTypes.1x Audio.1x AudioEvents.1x \
+		AutoExec.1x Base.1x Bevel.1x ColorScheme.1x Feel.1x \
+		Functions.1x Gravity.1x Look.1x MyBackground.1x MyFrame.1x \
+		MyStyle.1x Pager.1x PagerDecorations.1x SupportedHints.1x \
+		TbarLayout.1x Wharf.1x WharfSounds.1x WinList.1x WinTabs.1x \
+		asimagexml.1x
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .if defined(WITH_DIFFERENT_LOOKNFEELS)
 CONFIGURE_ARGS+=	--enable-different-looknfeels
@@ -41,20 +58,25 @@ CONFIGURE_ARGS+=	--enable-different-looknfeels
 CONFIGURE_ARGS+=	--disable-savewindows
 .endif
 
-MAN1=	Animate.1x Audio.1x Banner.1x Cascade.1x Clean.1x Form.1x Gnome.1x \
-	Ident.1x Pager.1x Save.1x Script.1x Scroll.1x Tile.1x Wharf.1x \
-	WinList.1x Zharf.1x afterstep.1x asetroot.1x
+post-extract:
+	${CP} ${FILESDIR}/monitor_bsd.xpm \
+		${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm
 
 post-patch:
-.for file in wharf.in zharf.in
-	${PERL} -pi -e 's,linux_penguin,monitor_bsd,' \
-		${WRKSRC}/afterstep/${file}
+.for file in afterstep/database
+	${PERL} -pi -e 's,linux-penguin,monitor-bsd,' \
+		${WRKSRC}/${file}
+.endfor
+.for file in libAfterBase/Makefile.in libAfterImage/Makefile.in
+	${PERL} -pi.orig -e 's,^install\.,noinstall.,g ; \
+		 s,^install:,install:#,g' ${WRKSRC}/${file}
+.endfor
+.for file in libAfterBase/configure libAfterImage/configure
+	${PERL} -pi.orig -e 's,="-O3",="$$CFLAGS",g' \
+		${WRKSRC}/${file}
 .endfor
-	${PERL} -pi.orig -e 's,/usr/X11/,${X11BASE}/,' \
-		${WRKSRC}/src/afterstep/afterstep.man
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${PREFIX}/share/afterstep/desktop/icons/common/
 .if defined(WITH_DIFFERENT_LOOKNFEELS)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===>  The WinList module is broken with different-looknfeels.  Don't use it."

x11-wm/afterstep-stable/distinfo

@@ -1,2 +1,2 @@
-MD5 (AfterStep-1.8.11.tar.bz2) = 6d8b41b7a642105b4cafc4d3d5f12a46
-SIZE (AfterStep-1.8.11.tar.bz2) = 1162212
+MD5 (AfterStep-2.00.00.tar.bz2) = 0f03a13b75c766dc5c76127e72c7b43f
+SIZE (AfterStep-2.00.00.tar.bz2) = 4663244

x11-wm/afterstep-stable/files/patch-libAfterBase::audit.c

@@ -0,0 +1,59 @@
+--- libAfterBase/audit.c.orig	Sat Sep 25 03:45:27 2004
++++ libAfterBase/audit.c	Wed Sep 29 15:36:51 2004
+@@ -498,7 +498,7 @@
+ #else
+ 	/*fprintf( stderr, "%s: freeing %p at %s:%d\n", __FUNCTION__, m->ptr, fname, line );*/
+ 	safefree (m->ptr);
+-	mem_destroy( (ASHashableValue)NULL, m );
++	mem_destroy( (ASHashableValue)(void*)NULL, m );
+ #endif
+ }
+ 
+@@ -817,7 +817,7 @@
+ */
+ 
+ 	XFreePixmap (display, pmap);
+-	mem_destroy( (ASHashableValue)NULL, m );
++	mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 	return Success;
+ }
+ 
+@@ -852,7 +852,7 @@
+ 	}
+ 
+ 	XFreeGC (display, gc);
+-	mem_destroy( (ASHashableValue)NULL, m );
++	mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 	return Success;
+ }
+ 
+@@ -931,17 +931,17 @@
+ 		/* can also be of C_MEM type if we allocated it ourselvs */
+ 		m = count_find_and_extract (fname, line, (void *)image, C_MEM);
+ 	if (m)
+-		mem_destroy( (ASHashableValue)NULL, m );
++		mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 
+ 	/* find and free the image->data pointer if it is in our list */
+ 	if( image_data )
+ 		if ((m = count_find_and_extract (fname, line, image_data, C_MEM)) != NULL)
+-			mem_destroy( (ASHashableValue)NULL, m );
++			mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 
+ 	/* find and free the image->obdata pointer if it is in our list */
+ 	if( image_obdata )
+ 		if ((m = count_find_and_extract (fname, line, image_obdata, C_MEM)) != NULL)
+-			mem_destroy( (ASHashableValue)NULL, m );
++			mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 
+ 	return Success;
+ }
+@@ -1140,7 +1140,7 @@
+ 	}
+ 
+ 	XFree (data);
+-	mem_destroy( (ASHashableValue)NULL, m );
++	mem_destroy( (ASHashableValue)(void*)NULL, m );
+ 	return Success;
+ }
+ 

x11-wm/afterstep-stable/files/patch-src::ASDocGen::Makefile.in

@@ -0,0 +1,21 @@
+--- src/ASDocGen/Makefile.in.orig	Wed Sep 15 07:55:46 2004
++++ src/ASDocGen/Makefile.in	Wed Sep 29 18:17:40 2004
+@@ -43,12 +43,12 @@
+ 	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
+ 	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
+ 		done; echo "Done"; \
+-		cd API; echo "Installing API man pages ..." ; \
+-		for f in `ls *.man`; do \
+-			page_name=`echo $$f| awk -F . '{print $$1}'`; \
+-	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
+-	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
+-		done; echo "Done"; \
++#		cd API; echo "Installing API man pages ..." ; \
++#		for f in `ls *.man`; do \
++#			page_name=`echo $$f| awk -F . '{print $$1}'`; \
++#	  		echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
++#	  		$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_API_DIR)/$$page_name.3x; \
++#		done; echo "Done"; \
+ 		cd ../..
+ 
+ install.data_html:  do_compile

x11-wm/afterstep-stable/files/patch-src::Wharf::Wharf.c

@@ -0,0 +1,13 @@
+--- src/Wharf/Wharf.c.orig	Tue Sep 28 05:39:05 2004
++++ src/Wharf/Wharf.c	Wed Sep 29 14:03:36 2004
+@@ -2357,8 +2357,9 @@
+             unmap_wharf_folder( aswf );
+         }else if( changes != 0 )
+         {
++            int i;
+ LOCAL_DEBUG_OUT("animation_steps = %d", aswf->animation_steps );
+-            int i = aswf->buttons_num ;
++            i = aswf->buttons_num ;
+ 
+ 			if( !get_flags( aswf->flags, ASW_Withdrawn ) )
+ 			{