2 files changed, 32 insertions, 84 deletions
diff --git a/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch
deleted file mode 100644
index c6bddc2c2..000000000
--- a/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -31,7 +31,7 @@
- CONFDIR=/etc/apparmor
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
- LOCALEDIR=/usr/share/locale
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
- 
- YACC	:= /usr/bin/bison
- YFLAGS	:= -d
-@@ -113,7 +113,7 @@
- export Q VERBOSE BUILD_OUTPUT
- 
- po/${NAME}.pot: ${SRCS} ${HDRS}
--	make -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
-+	$(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
- 
- techdoc.pdf: techdoc.tex
- 	while pdflatex $< ${BUILD_OUTPUT} || exit 1 ; \
-@@ -129,7 +129,7 @@
- # targets arranged this way so that people who don't want full docs can
- # pick specific targets they want.
- main: 	$(TOOLS)
--	$(Q)make -C po all
-+	$(MAKE) -C po all
- 
- manpages:	$(MANPAGES)
- 
-@@ -144,7 +144,7 @@
- apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
- 	rm -f ./libstdc++.a
- 	ln -s `g++ -print-file-name=libstdc++.a`
--	g++ $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
-+	$(CXX) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) \
- 	      ${LEXLIB}  $(AAREOBJECTS) -static-libgcc -L.
- 
- parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
-@@ -227,7 +227,7 @@
- .SILENT: tests
- tests: ${TESTS}
- 	sh -e -c 'for test in ${TESTS} ; do echo "*** running $${test}" && ./$${test} $(BUILD_OUTPUT) ; done'
--	$(Q)make -s -C tst tests
-+	$(MAKE) -s -C tst tests
- 
- .SILENT: check
- check: tests
-@@ -236,7 +236,7 @@
- .SILENT: $(AAREOBJECTS)
- .PHONY: $(AAREOBJECTS)
- $(AAREOBJECTS):
--	make -C $(AAREDIR) CFLAGS="$(EXTRA_CXXFLAGS)"
-+	$(MAKE) -C $(AAREDIR) CFLAGS="$(EXTRA_CXXFLAGS)"
- 
- .PHONY: install-rhel4
- install-rhel4: install-redhat
-@@ -280,12 +280,8 @@
- 	install -m 755 -d $(DESTDIR)/sbin
- 	install -m 755 ${TOOLS} $(DESTDIR)/sbin
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
--	install -m 755 -d ${DESTDIR}/var/lib/apparmor
--	install -m 755 -d $(APPARMOR_BIN_PREFIX)
--	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
--	make -C po install NAME=${NAME} DESTDIR=${DESTDIR}
--	make install_manpages DESTDIR=${DESTDIR}
-+	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
-+	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 
- .SILENT: clean
- .PHONY: clean
-@@ -300,9 +296,9 @@
- 	rm -f af_names.h
- 	rm -f cap_names.h
- 	rm -rf techdoc.aux techdoc.log techdoc.pdf techdoc.toc techdor.txt techdoc/
--	make -s -C $(AAREDIR) clean
--	make -s -C po clean
--	make -s -C tst clean
-+	$(MAKE) -s -C $(AAREDIR) clean
-+	$(MAKE) -s -C po clean
-+	$(MAKE) -s -C tst clean
- 
- .SILENT: dist_clean
- dist_clean:
diff --git a/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch b/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch
new file mode 100644
index 000000000..9575d00c4
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch
@@ -0,0 +1,32 @@
+--- Makefile
++++ Makefile
+@@ -31,7 +31,7 @@
+ CONFDIR=/etc/apparmor
+ INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
+ LOCALEDIR=/usr/share/locale
+-MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
++MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
+ 
+ YACC	:= /usr/bin/bison
+ YFLAGS	:= -d
+@@ -152,7 +152,7 @@
+ 	ln -s `$(CXX) -print-file-name=libstdc++.a`
+ 
+ apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
+-	$(CXX) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
++	$(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
+ 	      ${LEXLIB}  $(AAREOBJECTS) $(AARE_LDFLAGS)
+ 
+ parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
+@@ -284,11 +284,7 @@
+ .PHONY: install-indep
+ install-indep:
+ 	install -m 755 -d $(INSTALL_CONFDIR)
+-	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
+ 	install -m 644 parser.conf $(INSTALL_CONFDIR)
+-	install -m 755 -d ${DESTDIR}/var/lib/apparmor
+-	install -m 755 -d $(APPARMOR_BIN_PREFIX)
+-	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
+ 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
+ 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
+