Fri Mar 11 15:42:59 2016 UTC ()
Add perl to build tools. Fixes SunOS build and also enables man pages
and html docs. Bump PKGREVISION.


(fhajny)
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/PLIST
diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg3/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg3/patches/patch-doc_Makefile
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile 2016/03/05 11:28:59 1.2
+++ pkgsrc/multimedia/ffmpeg3/Makefile 2016/03/11 15:42:59 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:59 jperkin Exp $ 1# $NetBSD: Makefile,v 1.3 2016/03/11 15:42:59 fhajny Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/}
4PKGREVISION= 1 4PKGREVISION= 2
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software (v3.x) 7COMMENT= Decoding, encoding and streaming software (v3.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --disable-ffplay 12CONFIGURE_ARGS+= --disable-ffplay
13 13
14INSTALLATION_DIRS= lib/ffmpeg3 share/doc/ffmpeg3 share/examples/ffmpeg3 14INSTALLATION_DIRS= lib/ffmpeg3 share/doc/ffmpeg3 share/examples/ffmpeg3
15 15
16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg3/ffserver.conf \ 16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg3/ffserver.conf \
17 ${PKG_SYSCONFDIR}/ffserver.conf 17 ${PKG_SYSCONFDIR}/ffserver.conf
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/PLIST 2016/03/08 14:33:57 1.2
+++ pkgsrc/multimedia/ffmpeg3/PLIST 2016/03/11 15:42:59 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2016/03/08 14:33:57 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2016/03/11 15:42:59 fhajny Exp $
2bin/ffmpeg3 2bin/ffmpeg3
3bin/ffprobe3 3bin/ffprobe3
4bin/ffserver3 4bin/ffserver3
5include/ffmpeg3/libavcodec/avcodec.h 5include/ffmpeg3/libavcodec/avcodec.h
6include/ffmpeg3/libavcodec/avdct.h 6include/ffmpeg3/libavcodec/avdct.h
7include/ffmpeg3/libavcodec/avfft.h 7include/ffmpeg3/libavcodec/avfft.h
8include/ffmpeg3/libavcodec/d3d11va.h 8include/ffmpeg3/libavcodec/d3d11va.h
9include/ffmpeg3/libavcodec/dirac.h 9include/ffmpeg3/libavcodec/dirac.h
10include/ffmpeg3/libavcodec/dv_profile.h 10include/ffmpeg3/libavcodec/dv_profile.h
11include/ffmpeg3/libavcodec/dxva2.h 11include/ffmpeg3/libavcodec/dxva2.h
12include/ffmpeg3/libavcodec/qsv.h 12include/ffmpeg3/libavcodec/qsv.h
13include/ffmpeg3/libavcodec/vaapi.h 13include/ffmpeg3/libavcodec/vaapi.h
14include/ffmpeg3/libavcodec/vda.h 14include/ffmpeg3/libavcodec/vda.h
@@ -62,27 +62,27 @@ include/ffmpeg3/libavutil/hmac.h @@ -62,27 +62,27 @@ include/ffmpeg3/libavutil/hmac.h
62include/ffmpeg3/libavutil/imgutils.h 62include/ffmpeg3/libavutil/imgutils.h
63include/ffmpeg3/libavutil/intfloat.h 63include/ffmpeg3/libavutil/intfloat.h
64include/ffmpeg3/libavutil/intreadwrite.h 64include/ffmpeg3/libavutil/intreadwrite.h
65include/ffmpeg3/libavutil/lfg.h 65include/ffmpeg3/libavutil/lfg.h
66include/ffmpeg3/libavutil/log.h 66include/ffmpeg3/libavutil/log.h
67include/ffmpeg3/libavutil/lzo.h 67include/ffmpeg3/libavutil/lzo.h
68include/ffmpeg3/libavutil/macros.h 68include/ffmpeg3/libavutil/macros.h
69include/ffmpeg3/libavutil/mastering_display_metadata.h 69include/ffmpeg3/libavutil/mastering_display_metadata.h
70include/ffmpeg3/libavutil/mathematics.h 70include/ffmpeg3/libavutil/mathematics.h
71include/ffmpeg3/libavutil/md5.h 71include/ffmpeg3/libavutil/md5.h
72include/ffmpeg3/libavutil/mem.h 72include/ffmpeg3/libavutil/mem.h
73include/ffmpeg3/libavutil/motion_vector.h 73include/ffmpeg3/libavutil/motion_vector.h
74include/ffmpeg3/libavutil/murmur3.h 74include/ffmpeg3/libavutil/murmur3.h
75${PLIST.opencl}include/ffmpeg2/libavutil/opencl.h 75${PLIST.opencl}include/ffmpeg3/libavutil/opencl.h
76include/ffmpeg3/libavutil/opt.h 76include/ffmpeg3/libavutil/opt.h
77include/ffmpeg3/libavutil/parseutils.h 77include/ffmpeg3/libavutil/parseutils.h
78include/ffmpeg3/libavutil/pixdesc.h 78include/ffmpeg3/libavutil/pixdesc.h
79include/ffmpeg3/libavutil/pixelutils.h 79include/ffmpeg3/libavutil/pixelutils.h
80include/ffmpeg3/libavutil/pixfmt.h 80include/ffmpeg3/libavutil/pixfmt.h
81include/ffmpeg3/libavutil/random_seed.h 81include/ffmpeg3/libavutil/random_seed.h
82include/ffmpeg3/libavutil/rational.h 82include/ffmpeg3/libavutil/rational.h
83include/ffmpeg3/libavutil/rc4.h 83include/ffmpeg3/libavutil/rc4.h
84include/ffmpeg3/libavutil/replaygain.h 84include/ffmpeg3/libavutil/replaygain.h
85include/ffmpeg3/libavutil/ripemd.h 85include/ffmpeg3/libavutil/ripemd.h
86include/ffmpeg3/libavutil/samplefmt.h 86include/ffmpeg3/libavutil/samplefmt.h
87include/ffmpeg3/libavutil/sha.h 87include/ffmpeg3/libavutil/sha.h
88include/ffmpeg3/libavutil/sha512.h 88include/ffmpeg3/libavutil/sha512.h
@@ -132,34 +132,85 @@ lib/ffmpeg3/libswresample.so.2 @@ -132,34 +132,85 @@ lib/ffmpeg3/libswresample.so.2
132lib/ffmpeg3/libswresample.so.2.0.101 132lib/ffmpeg3/libswresample.so.2.0.101
133lib/ffmpeg3/libswscale.a 133lib/ffmpeg3/libswscale.a
134lib/ffmpeg3/libswscale.so 134lib/ffmpeg3/libswscale.so
135lib/ffmpeg3/libswscale.so.4 135lib/ffmpeg3/libswscale.so.4
136lib/ffmpeg3/libswscale.so.4.0.100 136lib/ffmpeg3/libswscale.so.4.0.100
137lib/ffmpeg3/pkgconfig/libavcodec.pc 137lib/ffmpeg3/pkgconfig/libavcodec.pc
138lib/ffmpeg3/pkgconfig/libavdevice.pc 138lib/ffmpeg3/pkgconfig/libavdevice.pc
139lib/ffmpeg3/pkgconfig/libavfilter.pc 139lib/ffmpeg3/pkgconfig/libavfilter.pc
140lib/ffmpeg3/pkgconfig/libavformat.pc 140lib/ffmpeg3/pkgconfig/libavformat.pc
141lib/ffmpeg3/pkgconfig/libavutil.pc 141lib/ffmpeg3/pkgconfig/libavutil.pc
142lib/ffmpeg3/pkgconfig/libpostproc.pc 142lib/ffmpeg3/pkgconfig/libpostproc.pc
143lib/ffmpeg3/pkgconfig/libswresample.pc 143lib/ffmpeg3/pkgconfig/libswresample.pc
144lib/ffmpeg3/pkgconfig/libswscale.pc 144lib/ffmpeg3/pkgconfig/libswscale.pc
 145man/man1/ffmpeg-all3.1
 146man/man1/ffmpeg-bitstream-filters3.1
 147man/man1/ffmpeg-codecs3.1
 148man/man1/ffmpeg-devices3.1
 149man/man1/ffmpeg-filters3.1
 150man/man1/ffmpeg-formats3.1
 151man/man1/ffmpeg-protocols3.1
 152man/man1/ffmpeg-resampler3.1
 153man/man1/ffmpeg-scaler3.1
 154man/man1/ffmpeg-utils3.1
 155man/man1/ffmpeg3.1
 156man/man1/ffprobe-all3.1
 157man/man1/ffprobe3.1
 158man/man1/ffserver-all3.1
 159man/man1/ffserver3.1
 160man/man3/libavcodec3.3
 161man/man3/libavdevice3.3
 162man/man3/libavfilter3.3
 163man/man3/libavformat3.3
 164man/man3/libavutil3.3
 165man/man3/libswresample3.3
 166man/man3/libswscale3.3
145share/doc/ffmpeg3/build_system.txt 167share/doc/ffmpeg3/build_system.txt
 168share/doc/ffmpeg3/developer.html
146share/doc/ffmpeg3/errno.txt 169share/doc/ffmpeg3/errno.txt
 170share/doc/ffmpeg3/faq.html
 171share/doc/ffmpeg3/fate.html
 172share/doc/ffmpeg3/ffmpeg-all.html
 173share/doc/ffmpeg3/ffmpeg-bitstream-filters.html
 174share/doc/ffmpeg3/ffmpeg-codecs.html
 175share/doc/ffmpeg3/ffmpeg-devices.html
 176share/doc/ffmpeg3/ffmpeg-filters.html
 177share/doc/ffmpeg3/ffmpeg-formats.html
 178share/doc/ffmpeg3/ffmpeg-protocols.html
 179share/doc/ffmpeg3/ffmpeg-resampler.html
 180share/doc/ffmpeg3/ffmpeg-scaler.html
 181share/doc/ffmpeg3/ffmpeg-utils.html
 182share/doc/ffmpeg3/ffmpeg.html
147share/doc/ffmpeg3/ffmpeg.txt 183share/doc/ffmpeg3/ffmpeg.txt
 184share/doc/ffmpeg3/ffprobe-all.html
 185share/doc/ffmpeg3/ffprobe.html
 186share/doc/ffmpeg3/ffserver-all.html
 187share/doc/ffmpeg3/ffserver.html
148share/doc/ffmpeg3/filter_design.txt 188share/doc/ffmpeg3/filter_design.txt
 189share/doc/ffmpeg3/general.html
 190share/doc/ffmpeg3/git-howto.html
149share/doc/ffmpeg3/issue_tracker.txt 191share/doc/ffmpeg3/issue_tracker.txt
 192share/doc/ffmpeg3/libavcodec.html
 193share/doc/ffmpeg3/libavdevice.html
 194share/doc/ffmpeg3/libavfilter.html
 195share/doc/ffmpeg3/libavformat.html
 196share/doc/ffmpeg3/libavutil.html
 197share/doc/ffmpeg3/libswresample.html
 198share/doc/ffmpeg3/libswscale.html
150share/doc/ffmpeg3/mips.txt 199share/doc/ffmpeg3/mips.txt
151share/doc/ffmpeg3/multithreading.txt 200share/doc/ffmpeg3/multithreading.txt
 201share/doc/ffmpeg3/nut.html
152share/doc/ffmpeg3/optimization.txt 202share/doc/ffmpeg3/optimization.txt
 203share/doc/ffmpeg3/platform.html
153share/doc/ffmpeg3/rate_distortion.txt 204share/doc/ffmpeg3/rate_distortion.txt
154share/doc/ffmpeg3/snow.txt 205share/doc/ffmpeg3/snow.txt
155share/doc/ffmpeg3/swresample.txt 206share/doc/ffmpeg3/swresample.txt
156share/doc/ffmpeg3/swscale.txt 207share/doc/ffmpeg3/swscale.txt
157share/doc/ffmpeg3/tablegen.txt 208share/doc/ffmpeg3/tablegen.txt
158share/doc/ffmpeg3/writing_filters.txt 209share/doc/ffmpeg3/writing_filters.txt
159share/examples/ffmpeg3/ffserver.conf 210share/examples/ffmpeg3/ffserver.conf
160share/ffmpeg3/examples/Makefile 211share/ffmpeg3/examples/Makefile
161share/ffmpeg3/examples/README 212share/ffmpeg3/examples/README
162share/ffmpeg3/examples/avio_dir_cmd.c 213share/ffmpeg3/examples/avio_dir_cmd.c
163share/ffmpeg3/examples/avio_reading.c 214share/ffmpeg3/examples/avio_reading.c
164share/ffmpeg3/examples/decoding_encoding.c 215share/ffmpeg3/examples/decoding_encoding.c
165share/ffmpeg3/examples/demuxing_decoding.c 216share/ffmpeg3/examples/demuxing_decoding.c
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile.common 2016/03/05 08:52:23 1.1
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common 2016/03/11 15:42:59 1.2
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1# $NetBSD: Makefile.common,v 1.1 2016/03/05 08:52:23 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.2 2016/03/11 15:42:59 fhajny Exp $
2# used by multimedia/ffmpeg3/Makefile 2# used by multimedia/ffmpeg3/Makefile
3# used by multimedia/ffplay3/Makefile 3# used by multimedia/ffplay3/Makefile
4 4
5DISTNAME= ffmpeg-3.0 5DISTNAME= ffmpeg-3.0
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake texi2html pod2man 16USE_TOOLS+= gmake texi2html pod2man perl
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18CONFIGURE_ARGS+= --cc=${CC:Q} 18CONFIGURE_ARGS+= --cc=${CC:Q}
19CONFIGURE_ARGS+= --disable-debug 19CONFIGURE_ARGS+= --disable-debug
20CONFIGURE_ARGS+= --disable-optimizations 20CONFIGURE_ARGS+= --disable-optimizations
21CONFIGURE_ARGS+= --disable-stripping 21CONFIGURE_ARGS+= --disable-stripping
22CONFIGURE_ARGS+= --enable-shared 22CONFIGURE_ARGS+= --enable-shared
23CONFIGURE_ARGS+= --enable-pthreads 23CONFIGURE_ARGS+= --enable-pthreads
24CONFIGURE_ARGS+= --enable-gpl 24CONFIGURE_ARGS+= --enable-gpl
25CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 25CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
26CONFIGURE_ARGS+= --prefix=${PREFIX} 26CONFIGURE_ARGS+= --prefix=${PREFIX}
27 27
28CONFIGURE_ARGS+= --progs-suffix=3 28CONFIGURE_ARGS+= --progs-suffix=3
29CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg3 29CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg3
 30CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg3
30CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg3 31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg3
31CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg3 32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg3
32CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg3 33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg3
33LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg3 34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg3
34 35
35PLIST_VARS+= opencl 36PLIST_VARS+= opencl
36 37
37.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) 38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
38CONFIGURE_ARGS+= --enable-opencl 39CONFIGURE_ARGS+= --enable-opencl
39PLIST.opencl= yes 40PLIST.opencl= yes
40.endif 41.endif
41 42
42.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg3/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/distinfo 2016/03/05 08:52:23 1.1
+++ pkgsrc/multimedia/ffmpeg3/distinfo 2016/03/11 15:42:59 1.2
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.1 2016/03/05 08:52:23 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2016/03/11 15:42:59 fhajny Exp $
2 2
3SHA1 (ffmpeg-3.0.tar.xz) = 383c8d3758aea027f1452fa98ae9016a28f74d8f 3SHA1 (ffmpeg-3.0.tar.xz) = 383c8d3758aea027f1452fa98ae9016a28f74d8f
4RMD160 (ffmpeg-3.0.tar.xz) = 542a711c39cb7270abd2835654f0abb565b0ba41 4RMD160 (ffmpeg-3.0.tar.xz) = 542a711c39cb7270abd2835654f0abb565b0ba41
5SHA512 (ffmpeg-3.0.tar.xz) = f3d9ff422112d24509d4cc73aa7b79fb858e8454fa44aa3d05cb1a1b1094dfa2c97680ffa6bb17aac4caf36e8dda1802a7f9f212e0f5f5ca74e7d45cacb2cfcc 5SHA512 (ffmpeg-3.0.tar.xz) = f3d9ff422112d24509d4cc73aa7b79fb858e8454fa44aa3d05cb1a1b1094dfa2c97680ffa6bb17aac4caf36e8dda1802a7f9f212e0f5f5ca74e7d45cacb2cfcc
6Size (ffmpeg-3.0.tar.xz) = 7463604 bytes 6Size (ffmpeg-3.0.tar.xz) = 7463604 bytes
7SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56 7SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
8SHA1 (patch-configure) = e57e2501e63a05e9eeefc688e311a16729d1a711 8SHA1 (patch-configure) = e57e2501e63a05e9eeefc688e311a16729d1a711
 9SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
9SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2 10SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
10SHA1 (patch-libavutil_opencl.c) = 3366c6c2aa7daaf097298214d2fff7c60c645ca4 11SHA1 (patch-libavutil_opencl.c) = 3366c6c2aa7daaf097298214d2fff7c60c645ca4
11SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548 12SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
12SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239 13SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239
File Added: pkgsrc/multimedia/ffmpeg3/patches/patch-doc_Makefile
$NetBSD: patch-doc_Makefile,v 1.1 2016/03/11 15:42:59 fhajny Exp $

Make man pages and html docs versioned.

--- doc/Makefile.orig	2016-02-15 02:29:37.000000000 +0000
+++ doc/Makefile
@@ -14,8 +14,8 @@ COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpe
 COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
 COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
 
-MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
-MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
+MANPAGES1   = $(AVPROGS-yes:%=doc/%3.1)    $(AVPROGS-yes:%=doc/%-all3.1)    $(COMPONENTS-yes:%=doc/%3.1)
+MANPAGES3   = $(LIBRARIES-yes:%=doc/%3.3)
 MANPAGES    = $(MANPAGES1) $(MANPAGES3)
 PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
 HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
@@ -114,10 +114,10 @@ doc/%-all.pod: doc/%.texi $(SRC_PATH)/do
 	$(Q)$(TEXIDEP)
 	$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
 
-doc/%.1 doc/%.3: TAG = MAN
-doc/%.1: doc/%.pod $(GENTEXI)
+doc/%3.1 doc/%3.3: TAG = MAN
+doc/%3.1: doc/%.pod $(GENTEXI)
 	$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
-doc/%.3: doc/%.pod $(GENTEXI)
+doc/%3.3: doc/%.pod $(GENTEXI)
 	$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
 
 $(DOCS) doc/doxy/html: | doc/