* remove a workaround now that uname -p returns MACHINE_ARCH
* unify/prettify Makefiles a bit
This commit is contained in:
naddy
parent
f4db603f87
commit
eb68cae212
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2011/10/17 11:14:11 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2011/11/01 16:44:19 naddy Exp $
|
||||
|
||||
COMMENT= unique standard tape archiver
|
||||
|
||||
@ -18,7 +18,7 @@ FLAVORS= static
|
||||
FLAVOR?=
|
||||
|
||||
USE_GMAKE= Yes
|
||||
USE_GROFF = Yes
|
||||
USE_GROFF= Yes
|
||||
MAKE_FLAGS= CCOM="${CC}" COPTOPT="${CFLAGS}" \
|
||||
CPPOPTX="-DDEFTAPE=\\\"/dev/rst0\\\" \
|
||||
-DSYSCONFDIR=\\\"$(SYSCONFDIR)\\\"" \
|
||||
@ -35,20 +35,20 @@ post-extract:
|
||||
|
||||
post-patch:
|
||||
perl -pi -e 's,/etc/default/,${SYSCONFDIR}/default/,g' \
|
||||
${WRKSRC}/star/defaults.c ${WRKSRC}/star/suntar.c \
|
||||
${WRKSRC}/star/star.1 ${WRKSRC}/mt/smt.1 \
|
||||
${WRKSRC}/rmt/rmt.c ${WRKSRC}/rmt/rmt.1
|
||||
${WRKSRC}/star/defaults.c ${WRKSRC}/star/suntar.c \
|
||||
${WRKSRC}/star/star.1 ${WRKSRC}/mt/smt.1 \
|
||||
${WRKSRC}/rmt/rmt.c ${WRKSRC}/rmt/rmt.1
|
||||
|
||||
do-configure:
|
||||
.if ${MACHINE} != "i386" || ${CC} != "cc"
|
||||
ln -sf ${WRKSRC}/RULES/i386-openbsd-cc.rul \
|
||||
${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
|
||||
cd ${WRKSRC}/RULES && \
|
||||
ln -sf i386-openbsd-cc.rul ${MACHINE}-openbsd-${CC}.rul
|
||||
.endif
|
||||
.if ${CC} != "cc" && ${CC} != "gcc"
|
||||
ln -sf ${WRKSRC}/RULES/cc-gcc.rul ${WRKSRC}/RULES/cc-${CC}.rul
|
||||
cd ${WRKSRC}/RULES && ln -sf cc-gcc.rul cc-${CC}.rul
|
||||
.endif
|
||||
|
||||
OBJ= OBJ/${MACHINE}-openbsd-${CC}
|
||||
OBJ= OBJ/${MACHINE_ARCH}-openbsd-${CC}
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/star
|
||||
@ -57,10 +57,10 @@ do-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/star/${OBJ}/star ${PREFIX}/bin
|
||||
cd ${PREFIX}/bin; ln -s star scpio; ln -s star spax
|
||||
${INSTALL_MAN} ${WRKSRC}/star/star.1 ${WRKSRC}/star/scpio.1 \
|
||||
${WRKSRC}/star/spax.1 ${PREFIX}/man/man1
|
||||
${WRKSRC}/star/spax.1 ${PREFIX}/man/man1
|
||||
${INSTALL_MAN} ${WRKSRC}/star/star.4 ${PREFIX}/man/man5/star.5
|
||||
${INSTALL_DATA} ${WRKSRC}/star/star.dfl \
|
||||
${PREFIX}/share/examples/star/default/star
|
||||
${PREFIX}/share/examples/star/default/star
|
||||
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/star_sym/${OBJ}/star_sym ${PREFIX}/bin
|
||||
|
||||
@ -70,7 +70,7 @@ do-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/rmt/${OBJ}/rmt ${PREFIX}/libexec/srmt
|
||||
${INSTALL_MAN} ${WRKSRC}/rmt/rmt.1 ${PREFIX}/man/man8/srmt.8
|
||||
${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl \
|
||||
${PREFIX}/share/examples/star/default/rmt
|
||||
${PREFIX}/share/examples/star/default/rmt
|
||||
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/tartest/${OBJ}/tartest ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/tartest/tartest.1 ${PREFIX}/man/man1
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-RULES_mk-gmake_id,v 1.3 2010/07/02 05:20:26 naddy Exp $
|
||||
--- RULES/mk-gmake.id.orig Wed Sep 9 14:29:28 2009
|
||||
+++ RULES/mk-gmake.id Thu Jul 1 05:52:03 2010
|
||||
@@ -54,7 +54,7 @@ ifndef GMAKE_NOWARN
|
||||
__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
|
||||
endif
|
||||
|
||||
-_MACHCMD= (mach || uname -p || true) 2> /dev/null
|
||||
+_MACHCMD= (mach || machine || uname -p || true) 2> /dev/null
|
||||
_ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
|
||||
|
||||
XP_ARCH:= $(shell $(_MACHCMD) | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"' 'abcdefghijklmnopqrstuvwxyz,//////' | tr ',/' ',\-')
|
||||
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2010/11/20 17:22:40 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2011/11/01 16:44:19 naddy Exp $
|
||||
|
||||
COMMENT= ISO 9660 filesystem and CD creation tools
|
||||
|
||||
DISTNAME= cdrtools-2.01
|
||||
REVISION = 1
|
||||
REVISION = 2
|
||||
CATEGORIES= sysutils
|
||||
HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
|
||||
|
||||
@ -24,31 +24,28 @@ MAKE_ENV= MAKEPROG=${MAKE_PROGRAM} \
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
CDRMACH= ${MACHINE}-openbsd-${CC}
|
||||
|
||||
.if ${MACHINE} != "i386" || ${CC} != "cc"
|
||||
do-configure:
|
||||
@ln -sf ${WRKSRC}/RULES/i386-openbsd-cc.rul \
|
||||
${WRKSRC}/RULES/${CDRMACH}.rul
|
||||
cd ${WRKSRC}/RULES && \
|
||||
ln -sf i386-openbsd-cc.rul ${MACHINE}-openbsd-${CC}.rul
|
||||
.endif
|
||||
|
||||
OBJ= OBJ/${MACHINE_ARCH}-openbsd-${CC}
|
||||
|
||||
do-install:
|
||||
@cp ${WRKSRC}/mkisofs/mkisofs.8 ${WRKSRC}/mkisofs/mkisofs.1
|
||||
.for PROG in cdda2wav cdrecord mkisofs readcd
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/${PROG}/OBJ/${CDRMACH}/${PROG} \
|
||||
${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/${PROG}/${PROG}.1 ${PREFIX}/man/man1
|
||||
.for i in cdda2wav cdrecord mkisofs readcd
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/$i/${OBJ}/$i ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/$i/$i.1 ${PREFIX}/man/man1
|
||||
.endfor
|
||||
.for PROG in devdump isodebug isodump isoinfo isovfy
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/mkisofs/diag/OBJ/${CDRMACH}/${PROG} \
|
||||
${PREFIX}/bin
|
||||
.for i in devdump isodebug isodump isoinfo isovfy
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/mkisofs/diag/${OBJ}/$i ${PREFIX}/bin
|
||||
.endfor
|
||||
${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 \
|
||||
${PREFIX}/man/man1/isoinfo.1
|
||||
@cd ${PREFIX}/man/man1; \
|
||||
for i in devdump.1 isovfy.1 ; do \
|
||||
ln -s isoinfo.1 $$i ; \
|
||||
done
|
||||
${PREFIX}/man/man1/isoinfo.1
|
||||
.for i in devdump.1 isovfy.1
|
||||
cd ${PREFIX}/man/man1 && ln -s isoinfo.1 $i
|
||||
.endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdrtools
|
||||
${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${PREFIX}/share/doc/cdrtools
|
||||
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-RULES_rules1_top,v 1.3 2004/11/30 05:44:03 jolan Exp $
|
||||
--- RULES/rules1.top.orig 2004-01-22 16:55:16.000000000 -0800
|
||||
+++ RULES/rules1.top 2004-03-08 19:45:37.000000000 -0800
|
||||
@@ -226,7 +226,7 @@ PARCH= $(__PARCH:$(_UNIQ)%=%)
|
||||
# See notes about $(SRCROOT)/ vs. $(SRCROOTSL) above.
|
||||
#
|
||||
###########################################################################
|
||||
-_DCC= $(SRCROOTSL)incs/Dcc.$(PARCH)$(-O_ARCH)
|
||||
+_DCC= $(SRCROOTSL)incs/Dcc.$(K_ARCH)$(-O_ARCH)
|
||||
|
||||
$(_DCC):
|
||||
sh $(SRCROOTSL)conf/cc-config.sh $(C_ARCH) $@
|
||||
@@ -249,7 +249,7 @@ include $(_DCC)
|
||||
#
|
||||
###########################################################################
|
||||
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
.print:
|
||||
echo $(XP_ARCH) $(P_ARCH) $(OARCH) $(XARCH)
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.3 2007/11/11 01:41:11 jakemsr Exp $
|
||||
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.4 2011/11/01 16:44:19 naddy Exp $
|
||||
--- cdda2wav/local.cnf.in.orig Thu Sep 4 01:35:46 2003
|
||||
+++ cdda2wav/local.cnf.in Mon Oct 29 03:18:42 2007
|
||||
@@ -43,7 +43,7 @@ HAVE_IOCTL= $(__HAVE_IOCTL:$(_UNIQ)$(HAVE_BSD_OS)$(HAV
|
||||
@ -10,10 +10,3 @@ $OpenBSD: patch-cdda2wav_local_cnf_in,v 1.3 2007/11/11 01:41:11 jakemsr Exp $
|
||||
SUN_SOUND_DEV= '"/dev/audio"'
|
||||
|
||||
HAVE_OSS= @HAVE_OSS@
|
||||
@@ -137,5 +137,5 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVICE=$(AUX_DEVIC
|
||||
|
||||
LIBS += @LIBS@
|
||||
|
||||
-VERSION_OS=@CDRTOOLS_VERSION@_$(O_ARCH)_$(OSREL)_$(K_ARCH)_$(P_ARCH)
|
||||
+VERSION_OS=@CDRTOOLS_VERSION@_$(O_ARCH)_$(OSREL)_$(K_ARCH)
|
||||
CUR_VERSION='"$(VERSION_OS)"'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2010/10/19 07:43:02 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2011/11/01 16:44:19 naddy Exp $
|
||||
|
||||
COMMENT= faster and improved version of dd
|
||||
|
||||
@ -12,28 +12,27 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c
|
||||
|
||||
WANTLIB= c
|
||||
|
||||
MASTER_SITES= ftp://ftp.berlios.de/pub/sdd/
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_ENV= MAKEPROG="${MAKE_PROGRAM}" CCOM="${CC}" COPTX="${CFLAGS}"
|
||||
|
||||
pre-configure:
|
||||
@perl -pi.bak -e 's/\x07//g' ${WRKDIST}/RULES/gmake.wrn
|
||||
|
||||
.if ${MACHINE} != "i386" || ${CC} != "cc"
|
||||
do-configure:
|
||||
@ln -sf ${WRKSRC}/RULES/i386-openbsd-cc.rul \
|
||||
${WRKSRC}/RULES/${MACHINE}-openbsd-${CC}.rul
|
||||
cd ${WRKSRC}/RULES && \
|
||||
ln -sf i386-openbsd-cc.rul ${MACHINE}-openbsd-${CC}.rul
|
||||
.endif
|
||||
|
||||
USE_GROFF = Yes
|
||||
USE_GROFF= Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
OBJ= OBJ/${MACHINE_ARCH}-openbsd-${CC}
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/sdd/OBJ/${MACHINE}-openbsd-${CC}/sdd \
|
||||
${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/sdd/${OBJ}/sdd ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/sdd/sdd.1 ${PREFIX}/man/man1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-RULES_rules1_top,v 1.1 2001/07/19 22:12:07 naddy Exp $
|
||||
--- RULES/rules1.top.orig Sun Feb 4 22:29:59 2001
|
||||
+++ RULES/rules1.top Thu Jul 19 23:48:17 2001
|
||||
@@ -186,7 +186,7 @@ __PARCH= $(_PARCH:$(_UNIQ)=$(PARCH_DEF))
|
||||
PARCH= $(__PARCH:$(_UNIQ)%=%)
|
||||
|
||||
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
|
||||
.print:
|
||||
echo $(XP_ARCH) $(P_ARCH)
|
||||
Loading…
Reference in New Issue
Block a user