From 29e623260f081950dd42f95de1451f2a7a4880e9 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 11 Nov 2002 19:41:27 +0000 Subject: Fix up some conflicts when moving from my CVS repo. --- textproc/gnome-spell/Makefile | 6 ++---- textproc/gnomespell-devel/Makefile | 6 ++---- textproc/gnomespell/Makefile | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile index 0e2f7efa44e2..2311e909f528 100644 --- a/textproc/gnome-spell/Makefile +++ b/textproc/gnome-spell/Makefile @@ -7,7 +7,6 @@ PORTNAME= gnomespell PORTVERSION= 0.5 -PORTREVISION= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-spell/0.5 @@ -16,15 +15,14 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell \ - gal.21:${PORTSDIR}/x11-toolkits/gal +LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOMENG= yes -USE_GNOME= gnomeprefix gnomehack libglade +USE_GNOME= gnomeprefix gnomehack libglade gal USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/gnomespell-devel/Makefile b/textproc/gnomespell-devel/Makefile index 0e2f7efa44e2..2311e909f528 100644 --- a/textproc/gnomespell-devel/Makefile +++ b/textproc/gnomespell-devel/Makefile @@ -7,7 +7,6 @@ PORTNAME= gnomespell PORTVERSION= 0.5 -PORTREVISION= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-spell/0.5 @@ -16,15 +15,14 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell \ - gal.21:${PORTSDIR}/x11-toolkits/gal +LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOMENG= yes -USE_GNOME= gnomeprefix gnomehack libglade +USE_GNOME= gnomeprefix gnomehack libglade gal USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile index 0e2f7efa44e2..2311e909f528 100644 --- a/textproc/gnomespell/Makefile +++ b/textproc/gnomespell/Makefile @@ -7,7 +7,6 @@ PORTNAME= gnomespell PORTVERSION= 0.5 -PORTREVISION= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-spell/0.5 @@ -16,15 +15,14 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell \ - gal.21:${PORTSDIR}/x11-toolkits/gal +LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOMENG= yes -USE_GNOME= gnomeprefix gnomehack libglade +USE_GNOME= gnomeprefix gnomehack libglade gal USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ -- cgit v1.2.3