summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2022-05-21 22:24:00 +0000
committerrillig <rillig@pkgsrc.org>2022-05-21 22:24:00 +0000
commitdce47a48e2d7a051579d7872f0796570eb9fede3 (patch)
treeb964bb98d4dd34143f48431498caf3a739cd05dc
parent839d29d31a48eb4439335faaff9cba1c3509b7da (diff)
downloadpkgsrc-dce47a48e2d7a051579d7872f0796570eb9fede3.tar.gz
php-gd: remove unknown configure option --with-xpm-dir
Add license, bump PKGREVISION.
-rw-r--r--graphics/php-gd/Makefile7
-rw-r--r--graphics/php-gd/options.mk14
2 files changed, 3 insertions, 18 deletions
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 16c3e5e48a3..bbbf1b2ab07 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2020/08/17 20:19:07 leot Exp $
+# $NetBSD: Makefile,v 1.49 2022/05/21 22:24:00 rillig Exp $
MODNAME= gd
+PKGREVISION= 2
CATEGORIES+= graphics
COMMENT= PHP extension for GD graphics library
-PKGREVISION= 1
+LICENSE= php
CONFLICTS= php-gd-[0-9]*
@@ -26,8 +27,6 @@ CONFIGURE_ARGS+= --with-external-gd
USE_PHP_EXT_PATCHES= yes
-.include "options.mk"
-
.include "../../graphics/gd/buildlink3.mk"
.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-gd/options.mk b/graphics/php-gd/options.mk
deleted file mode 100644
index d2ce3bb5200..00000000000
--- a/graphics/php-gd/options.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2016/08/13 17:34:41 taca Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS= x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ENV+= X11BASE=${X11BASE}
-CONFIGURE_ARGS+= --with-xpm-dir=${BUILDLINK_PREFIX.libXpm}
-.else
-CONFIGURE_ARGS+= --with-xpm-dir=no
-.endif