On 2017/11/15 13:34, Jan Stary wrote:
> On Nov 14 19:39:59, anth...@anjbe.name wrote:
> > Stuart Henderson writes:
> > > > do-build:
> > > > - cd ${WRKSRC} && \
> > > > + cd ${WRKSRC}/oggtag && \
> > > > ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
> > > > -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
> > > >
> > > > do-install:
> > > > - ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
> > > > - ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
> > > > + ${INSTALL_PROGRAM} ${WRKSRC}/oggtag/oggtag ${PREFIX}/bin
> > > > + ${INSTALL_MAN} ${WRKSRC}/oggtag/oggtag.1 ${PREFIX}/man/man1
> >
> > You should remove the WRKDIST=${WRKDIR} line instead.
>
> That fails for me. Did I missunderstand?
>
> Jan
>
>
> $ make
> ===> Building for oggtag-1.0.2
> cd /usr/ports/pobj/oggtag-1.0.2/oggtag_1.0.2 && cc -O2 -pipe -o
> oggtag oggtag.c vcedit.c -I/usr/local/include -L/usr/local/lib -lvorbis
> -logg -lm
> cc: error: no such file or directory: 'oggtag.c'
> cc: error: no such file or directory: 'vcedit.c'
> *** Error 1 in . (Makefile:30 'do-build')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2724
> '/usr/ports/pobj/oggtag-1.0.2/.build_done')
> *** Error 1 in /usr/ports/audio/oggtag
> (/usr/ports/infrastructure/mk/bsd.port.mk:2425 'all')
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/oggtag/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 22 Jan 2015 21:17:46 -0000 1.12
+++ Makefile 15 Nov 2017 12:52:18 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
COMMENT= command-line editor for tags in Ogg Vorbis files
-DISTNAME= oggtag_1.0
+DISTNAME= oggtag_1.0.2
PKGNAME= ${DISTNAME:S/_/-/}
-REVISION= 0
CATEGORIES= audio
HOMEPAGE= http://oggtag.sourceforge.net/
@@ -21,7 +20,7 @@ EXTRACT_SUFX= .tgz
LIB_DEPENDS= audio/libogg \
audio/libvorbis
-WRKDIST= ${WRKDIR}
+WRKSRC= ${WRKDIR}/oggtag
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/oggtag/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:12:46 -0000 1.4
+++ distinfo 15 Nov 2017 12:52:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (oggtag_1.0.tgz) = AZdZgRWUQl4DPfXtv6ygWZXsn66epQbTPWOtDaFQBzQ=
-SIZE (oggtag_1.0.tgz) = 14463
+SHA256 (oggtag_1.0.2.tgz) = hU+f3DttnqTERzX2b5NQqyHNcGDc0rjsz95skFB2Cxc=
+SIZE (oggtag_1.0.2.tgz) = 14689
Index: patches/patch-oggtag_c
===================================================================
RCS file: patches/patch-oggtag_c
diff -N patches/patch-oggtag_c
--- patches/patch-oggtag_c 10 Jun 2004 20:37:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-oggtag_c,v 1.1.1.1 2004/06/10 20:37:44 xsa Exp $
---- oggtag.c.orig 2002-12-02 10:03:27.000000000 +0100
-+++ oggtag.c 2004-06-10 16:51:58.000000000 +0200
-@@ -4,6 +4,8 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include "vcedit.h"
-
