From 52f0f29070f99c0443b4b094d4bf04ee7fbabc05 Mon Sep 17 00:00:00 2001 From: vd Date: Tue, 9 Oct 2007 16:29:50 +0000 Subject: * Remove some unnecessary dependencies * Install bin/PTOptimizer as bin/PTOptimizer12 to avoid conflicts with the forthcoming libpano13 --- graphics/libpano12/Makefile | 8 ++------ graphics/libpano12/files/patch-tools_Makefile.am | 15 +++++++++------ graphics/libpano12/pkg-plist | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'graphics') diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index fb3cd7ebaedf..c752d8c70c04 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -10,6 +10,7 @@ PORTNAME= libpano12 PORTVERSION= 2.8.6 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= SF MASTER_SITE_SUBDIR= panotools @@ -17,12 +18,9 @@ MASTER_SITE_SUBDIR= panotools MAINTAINER= vd@FreeBSD.org COMMENT= Panorama Tools to make panorama pictures -BUILD_DEPENDS= gimp>0:${PORTSDIR}/graphics/gimp -RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ png:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg \ - cairo:${PORTSDIR}/graphics/cairo + jpeg:${PORTSDIR}/graphics/jpeg USE_GNOME= gtk20 glib20 pango atk @@ -31,9 +29,7 @@ USE_AUTOTOOLS= autoconf:261:env autoheader:261:env aclocal:19:env \ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \ - -I${LOCALBASE}/include/gimp-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ - -I${LOCALBASE}/include/cairo \ -I${LOCALBASE}/include/pango-1.0 \ -I${LOCALBASE}/include/atk-1.0" diff --git a/graphics/libpano12/files/patch-tools_Makefile.am b/graphics/libpano12/files/patch-tools_Makefile.am index 3b2fd627497b..3e0ab5a65d5c 100644 --- a/graphics/libpano12/files/patch-tools_Makefile.am +++ b/graphics/libpano12/files/patch-tools_Makefile.am @@ -1,6 +1,6 @@ --- tools/Makefile.am.orig 2007-07-02 00:16:15.000000000 +0300 -+++ tools/Makefile.am 2007-10-08 11:31:50.000000000 +0300 -@@ -20,7 +20,15 @@ ++++ tools/Makefile.am 2007-10-09 19:10:41.000000000 +0300 +@@ -20,15 +20,23 @@ DAR_DEFS = endif @@ -16,10 +16,13 @@ +AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS) AM_LDFLAGS = -L${top_builddir} - bin_PROGRAMS = pano12info PTOptimizer -@@ -28,7 +36,7 @@ - PTOptimizer_SOURCES = PTOptimizer.c - PTOptimizer_LDADD = -lpano12 +-bin_PROGRAMS = pano12info PTOptimizer ++bin_PROGRAMS = pano12info PTOptimizer12 + +-PTOptimizer_SOURCES = PTOptimizer.c +-PTOptimizer_LDADD = -lpano12 ++PTOptimizer12_SOURCES = PTOptimizer.c ++PTOptimizer12_LDADD = -lpano12 -pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) +pano12info_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC) diff --git a/graphics/libpano12/pkg-plist b/graphics/libpano12/pkg-plist index 0216b5e6df32..b22e25025107 100644 --- a/graphics/libpano12/pkg-plist +++ b/graphics/libpano12/pkg-plist @@ -1,4 +1,4 @@ -bin/PTOptimizer +bin/PTOptimizer12 bin/pano12info include/pano12/PTcommon.h include/pano12/filter.h -- cgit