diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-18 20:32:02 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-18 20:32:02 +0000 |
| commit | 6620bb9bd57e4c8e1f2599517124a9578ab0a281 (patch) | |
| tree | 8dafe19b0ca7af383790a9c6302a705f6b86ba09 | |
| parent | 3c58c21574c836912e903e718c13e3dd8c3083c7 (diff) | |
| download | ports-6620bb9bd57e4c8e1f2599517124a9578ab0a281.tar.gz ports-6620bb9bd57e4c8e1f2599517124a9578ab0a281.zip | |
Notes
| -rw-r--r-- | graphics/libpano12/Makefile | 10 | ||||
| -rw-r--r-- | graphics/libpano12/files/patch-bootstrap | 48 |
2 files changed, 3 insertions, 55 deletions
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index 4c1323180a2c..13dfbb24de97 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -8,7 +8,7 @@ PORTNAME= libpano12 PORTVERSION= 2.8.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics java MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -21,9 +21,7 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ USE_GNOME= gtk20 glib20 pango atk -USES= libtool -USE_AUTOTOOLS= autoconf:env autoheader:env aclocal:env \ - automake:env libtoolize +USES= autoreconf libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ @@ -33,6 +31,7 @@ CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \ CONFIGURE_ARGS= --with-png=${LOCALBASE} \ --with-jpeg=${LOCALBASE} \ --with-tiff=${LOCALBASE} +INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -45,7 +44,4 @@ CONFIGURE_ARGS+= --with-java=${JAVA_HOME} CONFIGURE_ARGS+= --without-java .endif -pre-configure: - cd ${WRKSRC} && ./bootstrap - .include <bsd.port.mk> diff --git a/graphics/libpano12/files/patch-bootstrap b/graphics/libpano12/files/patch-bootstrap deleted file mode 100644 index cfe1fb317d39..000000000000 --- a/graphics/libpano12/files/patch-bootstrap +++ /dev/null @@ -1,48 +0,0 @@ ---- bootstrap.orig 2006-09-07 13:19:28.000000000 -0500 -+++ bootstrap 2009-07-13 19:56:34.000000000 -0500 -@@ -23,7 +23,7 @@ - libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'` - # echo libtool version: $libtool_version - case $libtool_version in -- 1.4*|1.5*) -+ 1.4*|1.5*|2.4*) - have_libtool=true - ;; - esac -@@ -60,7 +60,7 @@ - automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - # echo automake version: $automake_version - case $automake_version in -- 1.7*|1.8*|1.9*) -+ 1.7*|1.8*|1.9*|1.[1-9][0-9]*) - have_automake=true - ;; - esac -@@ -96,27 +96,3 @@ - $AUTOMAKE --add-missing --copy || exit $? - - $AUTOCONF || exit $? -- --cd $ORIGDIR || exit $? -- --echo --echo "I am going to run ./configure with the following arguments:" --echo --echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@" --echo -- --if test -z "$*"; then -- echo "If you wish to pass additional arguments, please specify them " -- echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS " -- echo "environment variable." -- echo --fi -- --$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" --RC=$? --if test $RC -ne 0; then -- echo -- echo "Configure failed or did not finish!" -- exit $RC --fi -- |