1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00

Add patch to ensure, the local directories are searched for headers

prior to ${LOCALBASE} and ${X11BASE}.

Reported by:	Udo Mueller

Add a forgotten patch to use INSTALL_SCRIPT, rather than _PROGRAM to
install an shell script (djvudigital).

Remove an empty line in Makefile.
This commit is contained in:
Mikhail Teterin 2005-10-19 13:02:42 +00:00
parent 3439a920d4
commit 051b81f73a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=145863
3 changed files with 38 additions and 1 deletions

View File

@ -45,7 +45,6 @@ CONFIGURE_ENV+= CXX=${CXX} \
CONFIGURE_ARGS+=--disable-djview --without-x
.endif
.if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local"
pre-configure:
${PERL5} -pi -e 's,/usr/local,${LOCALBASE},g' `${FIND} ${WRKSRC} \

View File

@ -0,0 +1,29 @@
--- xmltools/Makefile.in Tue Aug 24 13:58:56 2004
+++ xmltools/Makefile.in Wed Oct 19 08:45:42 2005
@@ -51,6 +51,6 @@
FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+CFLAGS += ${FLAGS} @CPPFLAGS@
+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS}
PROGRAMS = djvutoxml djvuxmlparser
+++ libdjvu/Makefile.in Wed Oct 19 08:45:42 2005
@@ -51,5 +51,5 @@
FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+CFLAGS += ${FLAGS} @CPPFLAGS@
+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS}
+++ tools/Makefile.in Wed Oct 19 08:45:42 2005
@@ -51,5 +51,5 @@
FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+CFLAGS += ${FLAGS} @CPPFLAGS@
+CXXFLAGS += ${FLAGS} @CPPFLAGS@ ${CXXRPOFLAGS}

View File

@ -0,0 +1,9 @@
--- gsfiles/Makefile.in Tue Aug 24 13:58:55 2004
+++ gsfiles/Makefile.in Tue Oct 18 18:36:57 2005
@@ -43,5 +43,5 @@
install-bin: djvudigital FORCE
${INSTALL} -d ${DESTDIR}${bindir}
- ${INSTALL_PROGRAM} -m 0755 ${srcdir}/djvudigital ${DESTDIR}${bindir}
+ ${BSD_INSTALL_SCRIPT} -m 0755 ${srcdir}/djvudigital ${DESTDIR}${bindir}
install-man: FORCE