Unbreak:

 - LIBTOOLize
 - USE_GCC=3.3 on 4.X
 - pet portlint

Closes PR:	ports/70099
Submitted by:	"Daniela"

2 files changed, 8 insertions, 22 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index f65a5bbdd6b3..cb1c5cfd1393 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -20,9 +20,16 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_GL=		yes
-USE_MESA=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL_VER=13
+
+.include <bsd.port.pre.mk>
+
+.if ( ${OSVERSION} < 500000 )
+USE_GCC=	3.3
+.endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -32,12 +39,6 @@ INSTALLS_SHLIB=	yes
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-CFLAGS+=	-O0
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|PLUGIN_FLAGS=|#PLUGIN_FLAGS=|g' ${WRKSRC}/configure
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/aqsis/files/patch-ltmain.sh b/graphics/aqsis/files/patch-ltmain.sh
deleted file mode 100644
index c30a9110600d..000000000000
--- a/graphics/aqsis/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Mon Apr 12 13:48:59 2004
-+++ ltmain.sh	Mon Apr 12 13:49:22 2004
-@@ -4394,10 +4394,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"