ports/130168: Minor cleanups to math/plplot
Pedro F. Giffuni
giffunip at tutopia.com
Sun Jan 4 18:30:02 UTC 2009
>Number: 130168
>Category: ports
>Synopsis: Minor cleanups to math/plplot
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 04 18:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: 7.1-RC2
>Organization:
>Environment:
FreeBSD kakumen.cable.net.co 7.1-RC2 FreeBSD 7.1-RC2 #0: Tue Dec 23 11:42:13 UTC 2008 root at driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Cleanups, no functional change:
- Remove build dependency on GNU m4.
- Sort knobs.
- Remove unneeded use of REINPLACE.
>How-To-Repeat:
>Fix:
diff -ruN plplot.orig/Makefile plplot/Makefile
--- plplot.orig/Makefile 2009-01-04 12:38:57.000000000 -0500
+++ plplot/Makefile 2009-01-04 12:54:35.000000000 -0500
@@ -13,7 +13,6 @@
MAINTAINER= giffunip at tutopia.com
COMMENT= A scientific plotting package
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
gd.4:${PORTSDIR}/graphics/gd \
qhull.5:${PORTSDIR}/math/qhull
@@ -21,9 +20,9 @@
USE_AUTOTOOLS= libltdl:15
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- M4="${LOCALBASE}/bin/gm4"
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
CONFIGURE_ARGS= --disable-cgm --disable-java --disable-octave \
--with-gd-incdir=${LOCALBASE}/include \
--with-gd-libdir=${LOCALBASE}/lib \
@@ -33,15 +32,8 @@
MAN1= plm2gif.1 plplot_libtool.1 plpr.1 pltek.1 pstex2eps.1
-.if defined(WITH_FORTRAN)
-PKGNAMESUFFIX= -fortran
-USE_FORTRAN= yes
-CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
-CONFIGURE_ARGS+= --enable-f95
-PLIST_SUB+= FORTRAN=""
-.else
-CONFIGURE_ARGS+= --disable-f77
-PLIST_SUB+= FORTRAN="@comment "
+.if !defined(WITHOUT_PTHREAD)
+CONFIGURE_ARGS+= --with-pthreads
.endif
.if defined(WITHOUT_X11)
@@ -54,16 +46,24 @@
PLIST_SUB+= X11=""
.endif
-.if !defined(WITHOUT_PTHREAD)
-CONFIGURE_ARGS+= --with-pthreads
+.if defined(WITH_FORTRAN)
+PKGNAMESUFFIX= -fortran
+USE_FORTRAN= yes
+CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+CONFIGURE_ARGS+= --enable-f95
+PLIST_SUB+= FORTRAN=""
+.else
+CONFIGURE_ARGS+= --disable-f77
+PLIST_SUB+= FORTRAN="@comment "
.endif
-.if defined(WITH_SVGALIB)
-LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
-PLIST_SUB+= SVGALIB=""
+.if defined(WITH_GNOME)
+.undef WITHOUT_X11
+USE_GNOME= libgnomeprintui libgnomeui
+PLIST_SUB+= GNOME=""
.else
-CONFIGURE_ARGS+= --disable-linuxvga
-PLIST_SUB+= SVGALIB="@comment "
+PLIST_SUB+= GNOME="@comment "
+CONFIGURE_ARGS+= --disable-gcw
.endif
.if defined(WITH_PYTHON)
@@ -75,13 +75,12 @@
PLIST_SUB+= PYTHON="@comment "
.endif
-.if defined(WITH_GNOME)
-.undef WITHOUT_X11
-USE_GNOME= libgnomeprintui libgnomeui
-PLIST_SUB+= GNOME=""
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
+PLIST_SUB+= SVGALIB=""
.else
-PLIST_SUB+= GNOME="@comment "
-CONFIGURE_ARGS+= --disable-gcw
+CONFIGURE_ARGS+= --disable-linuxvga
+PLIST_SUB+= SVGALIB="@comment "
.endif
.if defined(WITH_TCLTK)
@@ -109,12 +108,12 @@
@${ECHO_MSG} ""
@${ECHO_MSG} "PLplot has the following tunable options:"
@${ECHO_MSG} ""
- @${ECHO_MSG} " WITHOUT_X11=yes Turns off X11 support"
@${ECHO_MSG} " WITHOUT_PTHREAD=yes Turns off pthread support"
+ @${ECHO_MSG} " WITHOUT_X11=yes Turns off X11 support"
@${ECHO_MSG} " WITH_FORTRAN=yes Turns on Fortran support"
- @${ECHO_MSG} " WITH_SVGALIB=yes Turns on SVGAlib support"
@${ECHO_MSG} " WITH_GNOME=yes Turns on GNOME driver support"
@${ECHO_MSG} " WITH_PYTHON=yes Turns on Python support"
+ @${ECHO_MSG} " WITH_SVGALIB=yes Turns on SVGAlib support"
@${ECHO_MSG} " WITH_TCLTK=yes Turns on Tcl/Tk support"
@${ECHO_MSG} ""
@@ -123,8 +122,6 @@
s|-ltcl$$|-ltcl84|g ; \
s|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
s|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|tk octave java|tk|g' \
- ${WRKSRC}/bindings/Makefile.in
@${REINPLACE_CMD} -e 's| tclsh | ${LOCALBASE}/bin/tclsh8.4 |g' \
${WRKSRC}/scripts/mktclIndex
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list