On Sun, Apr 02, 2006 at 08:18:50PM -0700, Jacob Meuser wrote:
> On Sun, Apr 02, 2006 at 11:59:23PM +0200, Tobias Ulmer wrote:
> > On Sun, Apr 02, 2006 at 07:14:05PM +0200, steven mestdagh wrote:
> 
> > > i'll take care of this.  a first, very quick glance:
> > > why do you have patch-configure_in and patch-configure? can you just
> > > make the port run autoconf?
> > 
> > using autoconf to generate the configure script ist not a problem.
> > 
> > However there are custom macros, #defines and #includes that don't
> > belong there in the *.h.in files sprinkled all over the place and
> > autoheader removes them all. Fixing this seems to be a too large task
> > to me.
> > 
> > I can think of three solutions:
> > 
> > * Use CONFIGURE_STYLE=autoconf and prevent autoheader from running,
> >   somehow... (How?)
> > 
> > * Use CONFIGURE_STYLE=gnu and run autoconf after 'patch'
> > 
> > * Just provide the (large) patch-configure diff
> 
> CONFIGURE_STYLE=autoconf no-autoheader
> 
> -- 
> <[EMAIL PROTECTED]>
> 
>

Sweet! Diff against scilab3.tar.gz:

Index: Makefile
===================================================================
RCS file: /home/tobiasu/cvsroot/ports/scilab/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile    3 Apr 2006 00:30:32 -0000       1.3
+++ Makefile    3 Apr 2006 12:49:34 -0000       1.4
@@ -20,7 +20,7 @@
 
 MASTER_SITES=          http://www.scilab.org/download/stable/
 
-BUILD_DEPENDS=         ::textproc/libxslt ${MODGNU_AUTOCONF_DEPENDS}
+BUILD_DEPENDS=         ::textproc/libxslt
 LIB_DEPENDS=           tcl84::lang/tcl/8.4 tk84::x11/tk/8.4
 
 USE_X11=               Yes
@@ -28,16 +28,10 @@
 USE_LIBTOOL=           Yes
 
 AUTOCONF_VERSION=      2.59
-AUTOCONF=              /usr/local/bin/autoconf
-
-CONFIGURE_STYLE=       gnu
+CONFIGURE_STYLE=       autoconf no-autoheader
 CONFIGURE_ARGS+=       --without-ocaml --without-java \
                        --without-local-xaw --without-pvm
 
 WRKDIST=               ${WRKDIR}/${PKGNAME}
-
-post-patch:
-       cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-       ${AUTOCONF} configure.in > configure
 
 .include <bsd.port.mk>

Reply via email to