diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2017-12-24 17:00:29 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2017-12-24 17:00:29 +0000 |
commit | 5f958dc7561010e8c4049b480d9c178483dbbdd8 (patch) | |
tree | e8006d996bb4df3b10865d9fa905aafbba640900 /cad | |
parent | 85e3a4832d2f9e90f2bbf40ed0e3eede15affbff (diff) |
Remove a patch for configure.ac so we can remove USE_AUTOTOOLS. The patch
added two variables that weren't used anywhere.
Notes
Notes:
svn path=/head/; revision=457179
Diffstat (limited to 'cad')
-rw-r--r-- | cad/pcb/Makefile | 1 | ||||
-rw-r--r-- | cad/pcb/files/patch-Makefile.in | 22 | ||||
-rw-r--r-- | cad/pcb/files/patch-configure.ac | 31 |
3 files changed, 3 insertions, 51 deletions
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 641d1f3b4773..db32811139be 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} CONFLICTS= gts-[0-9]* -USE_AUTOTOOLS= autoconf USES= gmake pkgconfig tk:run shared-mime-info desktop-file-utils USE_GNOME= intltool INSTALLS_ICONS= yes diff --git a/cad/pcb/files/patch-Makefile.in b/cad/pcb/files/patch-Makefile.in index 87c4d01d717c..69099d804f94 100644 --- a/cad/pcb/files/patch-Makefile.in +++ b/cad/pcb/files/patch-Makefile.in @@ -1,22 +1,6 @@ ---- Makefile.in.orig 2011-09-19 05:06:21.000000000 +0900 -+++ Makefile.in 2012-03-17 19:18:58.000000000 +0900 -@@ -156,6 +156,7 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ -+EXAMPLE = @EXAMPLE@ - EXEEXT = @EXEEXT@ - FONTFILENAME = @FONTFILENAME@ - GDLIB_CONFIG = @GDLIB_CONFIG@ -@@ -259,6 +260,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@ -@@ -330,11 +332,11 @@ +--- Makefile.in.orig 2014-03-17 03:14:44 UTC ++++ Makefile.in +@@ -362,11 +362,11 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/cad/pcb/files/patch-configure.ac b/cad/pcb/files/patch-configure.ac deleted file mode 100644 index 014db155fd47..000000000000 --- a/cad/pcb/files/patch-configure.ac +++ /dev/null @@ -1,31 +0,0 @@ ---- 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]) |