aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2010-10-03 21:42:06 +0800
committerhrs <hrs@FreeBSD.org>2010-10-03 21:42:06 +0800
commit6cebc8070e80ae6fb2c832a993bebbcf5bdcddb2 (patch)
tree647ac7efa56d4fd0f4b3466f2770946d2016fbc8
parent313340f8d6728bdf45e2a1e59820a59a0c82f833 (diff)
downloadfreebsd-ports-gnome-6cebc8070e80ae6fb2c832a993bebbcf5bdcddb2.tar.gz
freebsd-ports-gnome-6cebc8070e80ae6fb2c832a993bebbcf5bdcddb2.tar.zst
freebsd-ports-gnome-6cebc8070e80ae6fb2c832a993bebbcf5bdcddb2.zip
Fix build in the NOPORTDOCS=yes case.
Spotted by: QAT
-rw-r--r--cad/pcb/Makefile3
-rw-r--r--cad/pcb/files/patch-Makefile.in26
-rw-r--r--cad/pcb/files/patch-configure.ac31
-rw-r--r--cad/pcb/pkg-plist3
4 files changed, 57 insertions, 6 deletions
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index b923a49dd6e1..e3d776683580 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pcb
PORTVERSION= 20100929
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -20,6 +20,7 @@ RUN_DEPENDS= m4>=1.4.11:${PORTSDIR}/devel/m4 \
BUILD_DEPENDS= ${RUN_DEPENDS}
GNU_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf:267
USE_GMAKE= yes
USE_TK_RUN= 83
INSTALLS_ICONS= yes
diff --git a/cad/pcb/files/patch-Makefile.in b/cad/pcb/files/patch-Makefile.in
index 9475734fdba5..d8f83e742e99 100644
--- a/cad/pcb/files/patch-Makefile.in
+++ b/cad/pcb/files/patch-Makefile.in
@@ -1,11 +1,27 @@
---- Makefile.in.orig 2010-05-21 03:09:49.000000000 +0900
-+++ Makefile.in 2010-05-21 05:07:04.000000000 +0900
-@@ -282,11 +282,11 @@
- target_alias = @target_alias@
+--- Makefile.in.orig 2010-09-30 05:52:41.000000000 +0900
++++ Makefile.in 2010-10-03 22:23:20.000000000 +0900
+@@ -135,6 +135,7 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++EXAMPLE = @EXAMPLE@
+ EXEEXT = @EXEEXT@
+ FONTFILENAME = @FONTFILENAME@
+ GDLIB_CONFIG = @GDLIB_CONFIG@
+@@ -240,6 +241,7 @@
+ STRIP = @STRIP@
+ TEXI2DVI = @TEXI2DVI@
+ TOPDIRS = @TOPDIRS@
++TUTORIAL = @TUTORIAL@
+ UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
+ UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@
+ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+@@ -313,11 +315,11 @@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DIRS = win32 intl src data lib newlib example tools tutorial README_FILES po tests
-+DIRS = intl src data lib newlib example tools tutorial README_FILES po tests
++DIRS = intl src data lib newlib @EXAMPLE@ tools @TUTORIAL@ README_FILES po tests
SUBDIRS = ${DIRS} @DOC@
DIST_SUBDIRS = ${DIRS} doc
INTLTOOL_FILES = intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/cad/pcb/files/patch-configure.ac b/cad/pcb/files/patch-configure.ac
new file mode 100644
index 000000000000..014db155fd47
--- /dev/null
+++ b/cad/pcb/files/patch-configure.ac
@@ -0,0 +1,31 @@
+--- configure.ac.orig 2010-09-30 05:38:34.000000000 +0900
++++ configure.ac 2010-10-03 22:29:55.000000000 +0900
+@@ -54,20 +54,28 @@
+ [
+ if test "X$enable_doc" = "Xno" ; then
+ DOC=""
++ EXAMPLE=""
++ TUTORIAL=""
+ AC_MSG_RESULT([no])
+ docs_yesno=no
+ else
+ DOC=doc
++ EXAMPLE=example
++ TUTORIAL=tutorial
+ AC_MSG_RESULT([yes])
+ docs_yesno=yes
+ fi
+ ],
+ [
+ DOC=doc
++EXAMPLE=example
++TUTORIAL=tutorial
+ AC_MSG_RESULT([yes])
+ docs_yesno=yes
+ ])
+ AC_SUBST(DOC)
++AC_SUBST(EXAMPLE)
++AC_SUBST(TUTORIAL)
+
+
+ AC_MSG_CHECKING([if maintainer mode is required])
diff --git a/cad/pcb/pkg-plist b/cad/pcb/pkg-plist
index 4ce875555e6b..796e30c8c01b 100644
--- a/cad/pcb/pkg-plist
+++ b/cad/pcb/pkg-plist
@@ -50,6 +50,9 @@ share/mimelnk/application/x-pcb-layout.desktop
share/mimelnk/application/x-pcb-netlist.desktop
@dirrmtry share/mimelnk/application
@dirrmtry share/mimelnk
+share/gEDA/scheme/gnet-pcbfwd.scm
+@dirrmtry share/gEDA/scheme
+@dirrmtry share/gEDA
%%DATADIR%%/default_font
%%DATADIR%%/gpcb-menu.res
%%DATADIR%%/pcb-menu.res