cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use BASE_PKGPATH instead of homegrown variable, no bumps needed

Browse Source
This commit is contained in:
steven 2006-12-14 09:07:55 +00:00
parent 5d506bf087
commit b6d439743e
14 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/jdk/1.4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2006/11/24 21:35:29 steven Exp $
# $OpenBSD: Makefile,v 1.20 2006/12/14 09:07:55 steven Exp $
# $FreeBSD: /repoman/r/pcvs/ports/java/jdk14/Makefile,v 1.79 2004/08/18 07:06:03 glewis Exp $
ONLY_FOR_ARCHS= i386
@ -114,9 +114,7 @@ MAKE_ENV+= NO_JAVAWS="YES"
JDKHOME= jdk-${V}
JREHOME= jre-${V}
MAINPATH= devel/jdk/1.4${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= JDKHOME JREHOME MAINPATH
SUBST_VARS= JDKHOME JREHOME
SYSTRACE_SUBST_VARS= LOCALBASE
# Deal with Sun's internal build structure

4
devel/jdk/1.4/pkg/PLIST-main
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.2 2006/11/24 21:35:29 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2006/12/14 09:07:56 steven Exp $
@option no-default-conflict
@conflict jdk->=1.4,<1.5
@pkgpath ${MAINPATH}
@pkgpath ${BASE_PKGPATH}
@pkgpath devel/jdk/1.4,native_bootstrap
${JDKHOME}/
${JDKHOME}/COPYRIGHT

6
devel/jdk/1.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2006/11/24 21:30:13 steven Exp $
# $OpenBSD: Makefile,v 1.30 2006/12/14 09:07:56 steven Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -115,9 +115,7 @@ MAKE_ENV+= DONT_BUILD_DEPLOY="YES"
JDKHOME= jdk-${V}
JREHOME= jre-${V}
MAINPATH= devel/jdk/1.5${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= JDKHOME JREHOME MAINPATH
SUBST_VARS= JDKHOME JREHOME
.if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Dclient_vm=1

4
devel/jdk/1.5/pkg/PLIST-main
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.2 2006/11/24 21:30:13 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2006/12/14 09:07:56 steven Exp $
@option no-default-conflict
@conflict jdk->=1.5,<1.6
@pkgpath devel/jdk/1.5,native_bootstrap
@pkgpath ${MAINPATH}
@pkgpath ${BASE_PKGPATH}
${JDKHOME}/
${JDKHOME}/COPYRIGHT
${JDKHOME}/LICENSE

8
editors/emacs21/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2006/11/24 22:14:42 espie Exp $
# $OpenBSD: Makefile,v 1.34 2006/12/14 09:07:56 steven Exp $
.if ${MACHINE_ARCH} == "hppa"
BROKEN= "hangs indefinitely until machine panics/hangs"
@ -50,23 +50,21 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fno-stack-protector"
MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}"
SUBST_VARS= GCCARCH VERSION MAINPATH
SUBST_VARS= GCCARCH VERSION
WANTLIB-main= c m ncurses ossaudio
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+= --with-x=no
MAINPATH= editors/emacs21,no_x11
.else
USE_X11=Yes
LIB_DEPENDS-main= ungif.>=5::graphics/libungif \
jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png \
tiff.>=35::graphics/tiff
MAINPATH= editors/emacs21
WANTLIB-main+= ICE SM X11 Xaw Xext Xmu Xpm Xt z
.endif
RUN_DEPENDS= :emacs-${VERSION}*:${MAINPATH}
RUN_DEPENDS= :emacs-${VERSION}*:${BUILD_PKGPATH}
RUN_DEPENDS-main=
PKG_ARCH-el= *

4
editors/emacs21/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 22:14:42 espie Exp $
@pkgpath ${MAINPATH}
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $
@pkgpath ${BASE_PKGPATH}
bin/b2m
bin/ctags
bin/ebrowse

8
editors/vim/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.75 2006/11/21 11:25:03 espie Exp $
# $OpenBSD: Makefile,v 1.76 2006/12/14 09:07:56 steven Exp $
COMMENT-main= "vi clone, many additional features"
COMMENT-lang= "vi clone, NLS subpackage"
@ -114,9 +114,7 @@ WANTLIB+= ICE SM X11 Xext Xrender Xt fontconfig freetype m z\
ERRORS= "Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif"
.endif
MAINPATH= editors/vim${FLAVOR_EXT:S/-/,/g}
RUN_DEPENDS-lang= ::${MAINPATH}
RUN_DEPENDS-lang= ::${BUILD_PKGPATH}
PKG_ARCH-lang= *
LIB_DEPENDS-lang=
WANTLIB-lang=
@ -125,7 +123,7 @@ MODULES= devel/gettext
WRKDIST= ${WRKDIR}/${P}
WRKSRC= ${WRKDIST}/src
SUBST_VARS= P MAINPATH
SUBST_VARS= P
# don't try to regenerate the configure script. Works around the fact that
# auto/configure.in is newer than auto/configure.

4
editors/vim/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 11:25:03 espie Exp $
@pkgpath ${MAINPATH}
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $
@pkgpath ${BASE_PKGPATH}
%%gtk2%%
bin/ex
bin/rview

5
mail/cyrus-imapd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2006/11/25 19:51:14 steven Exp $
# $OpenBSD: Makefile,v 1.11 2006/12/14 09:07:56 steven Exp $
COMMENT-main= "Cyrus IMAP server"
COMMENT-perl= "perl utils for the Cyrus IMAP server"
@ -80,9 +80,6 @@ CONFIGURE_ARGS+=--with-auth=unix \
WANTLIB-main= ${WANTLIB} wrap c pthread
MAINPATH= mail/cyrus-imapd${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= MAINPATH
NO_REGRESS= Yes
MAN8= fetchnews idled master imapd

4
mail/cyrus-imapd/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 19:51:14 steven Exp $
@pkgpath ${MAINPATH}
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $
@pkgpath ${BASE_PKGPATH}
@newgroup _cyrus:543
@newuser _cyrus:543:_cyrus:daemon:Cyrus Account:/var/empty:/sbin/nologin
bin/imtest

5
net/samba/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.76 2006/11/25 13:00:41 espie Exp $
# $OpenBSD: Makefile,v 1.77 2006/12/14 09:07:56 steven Exp $
COMMENT-main= "SMB and CIFS client and server for UNIX"
COMMENT-docs= "documentation and examples for samba"
@ -39,8 +39,7 @@ FAKE_FLAGS= DESTDIR="${DESTDIR}" \
CONFDIR= ${SYSCONFDIR}/samba
SAMBA_LOGDIR= /var/log
MAINPATH= ${PKGPATH}${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= CONFDIR LOCALBASE SYSCONFDIR MAINPATH
SUBST_VARS= CONFDIR LOCALBASE SYSCONFDIR
SEPARATE_BUILD= concurrent
AUTOCONF_VERSION= 2.59

4
net/samba/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 13:00:41 espie Exp $
@pkgpath ${MAINPATH}
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $
@pkgpath ${BASE_PKGPATH}
bin/eventlogadm
bin/findsmb
bin/mksmbpasswd

6
x11/fvwm2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2006/11/25 07:55:25 steven Exp $
# $OpenBSD: Makefile,v 1.40 2006/12/14 09:07:56 steven Exp $
COMMENT-main= "multiple virtual desktop window manager, with icons"
COMMENT-fvicons="multiple virtual desktop window manager icons"
@ -59,9 +59,7 @@ PKG_ARCH-fvicons= *
LIB_DEPENDS-fvicons=
WANTLIB-fvicons=
MAINPATH= x11/fvwm2${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= VERSION MAINPATH
SUBST_VARS= VERSION
USE_X11= Yes

4
x11/fvwm2/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 07:55:25 steven Exp $
@pkgpath ${MAINPATH}
@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $
@pkgpath ${BASE_PKGPATH}
@conflict fvwm2-*
@conflict fvicons-*
@conflict fvwm95-*