diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-21 11:09:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-21 11:09:43 +0000 |
| commit | 34eea5a75eb59c4c2063925199f9bb95d3062c1b (patch) | |
| tree | 76002256d0893e272d22ee8dbeed90ab035659e3 /editors/abiword | |
| parent | c0eccacb64888360681adff14325a4fe08c262cb (diff) | |
| download | pkgsrc-34eea5a75eb59c4c2063925199f9bb95d3062c1b.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'editors/abiword')
| -rw-r--r-- | editors/abiword/Makefile | 31 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ai | 17 |
2 files changed, 12 insertions, 36 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 589de4ae28c..a8f8122c9a6 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2002/09/10 16:06:40 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2002/09/21 11:18:57 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -20,15 +20,15 @@ DEPENDS+= ispell-base-[0-9]*:../../textproc/ispell-base DIST_SUBDIR= abisuite ABIWORD_VERS= 1.0.2 -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined USE_X11= # defined USE_GMAKE= # defined HAS_CONFIGURE= # defined MAKEFILE= GNUmakefile -CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-psiconv=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-psiconv=${BUILDLINK_PREFIX.psiconv} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} CONFIGURE_ARGS+= --without-libwmf CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --datadir=${PREFIX}/share @@ -46,18 +46,11 @@ MAKE_FLAGS+= UNIX_CAN_BUILD_STATIC=0 WRKSRC= ${WRKDIR}/${DISTNAME}/abi -FILES_SUBST= LN=${LN:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - -.include "../../converters/libiconv/buildlink.mk" -.include "../../converters/psiconv/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../converters/libiconv/buildlink2.mk" +.include "../../converters/psiconv/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/patches/patch-ai b/editors/abiword/patches/patch-ai deleted file mode 100644 index 3c3857d901a..00000000000 --- a/editors/abiword/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.5 2001/08/10 04:50:09 jlam Exp $ - ---- src/config/platforms/netbsd.mk.orig Fri Jun 8 12:07:03 2001 -+++ src/config/platforms/netbsd.mk -@@ -75,9 +75,9 @@ - # Linker flags - OS_DLLFLAGS += - --GLIB_CONFIG = glib-config --GTK_CONFIG = gtk-config --GNOME_CONFIG = gnome-config -+#GLIB_CONFIG = glib-config -+#GTK_CONFIG = gtk-config -+#GNOME_CONFIG = gnome-config - - # Shared library flags - MKSHLIB = $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so) |