aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/kdelibdocs/Makefile2
-rw-r--r--editors/custom-mule/Makefile6
-rw-r--r--editors/mule/Makefile4
-rw-r--r--editors/xemacs21-mule/Makefile4
-rw-r--r--japanese/ewipe/Makefile4
-rw-r--r--japanese/jvim/Makefile4
-rw-r--r--japanese/jvim3/Makefile4
-rw-r--r--japanese/kinput2-freewnn/Makefile2
-rw-r--r--japanese/kinput2/Makefile2
-rw-r--r--japanese/netscape47-communicator/Makefile4
-rw-r--r--korean/netscape47-communicator/Makefile4
-rw-r--r--mail/mew/Makefile2
-rw-r--r--mail/qmail-ldap/Makefile10
-rw-r--r--print/gp/Makefile2
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server/Makefile2
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile2
-rw-r--r--x11-servers/XttXF86srv-common/Makefile2
-rw-r--r--x11/XFree86-4-clients/Makefile2
22 files changed, 35 insertions, 35 deletions
diff --git a/devel/kdelibdocs/Makefile b/devel/kdelibdocs/Makefile
index 59efa7a230d4..b10978dc3833 100644
--- a/devel/kdelibdocs/Makefile
+++ b/devel/kdelibdocs/Makefile
@@ -21,6 +21,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--with-qtdoc-dir=${X11BASE}/share/doc/qt/html" \
"--with-qt-includes=${X11BASE}/include/X11/qt"
-PATCHDIR= ${.CURDIR}/patches
+PATCHDIR= ${.CURDIR}/files
.include <bsd.port.mk>
diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile
index a6d38571c45e..4c61b05d82ae 100644
--- a/editors/custom-mule/Makefile
+++ b/editors/custom-mule/Makefile
@@ -16,8 +16,8 @@ MASTERDIR= ${.CURDIR}/../../editors/custom-emacs
EMACS_PORT_NAME= mule
# pkg/* files but PLIST are used in ${.CURDIR}
-PKGDIR= ${.CURDIR}/pkg
-PATCHDIR= ${.CURDIR}/patches
-PLIST= ${MASTERDIR}/pkg/PLIST
+PKGDIR= ${.CURDIR}
+PATCHDIR= ${.CURDIR}/files
+PLIST= ${MASTERDIR}/pkg-plist
.include <${MASTERDIR}/Makefile>
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index c610c100b98c..5b110c8998ee 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -33,10 +33,10 @@ SLAVEDIRS= chinese/mule-freewnn
USE_XLIB= yes
EXTRACT_ONLY= emacs-${EMACS_VERSION}b${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/emacs-${EMACS_VERSION}
-PATCHDIR= ${.CURDIR}/../../editors/mule-common/patches
+PATCHDIR= ${.CURDIR}/../../editors/mule-common/files
FILESDIR= ${.CURDIR}/../../editors/mule-common/files
SCRIPTDIR= ${.CURDIR}/../../editors/mule-common/scripts
-PLIST= ${.CURDIR}/../../editors/mule/pkg/PLIST
+PLIST= ${.CURDIR}/../../editors/mule/pkg-plist
INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME}
PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
GNU_CONFIGURE= yes
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 899658537995..675f0d5300b0 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -68,8 +68,8 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME}
STRIP=
INSTALL_TARGET?=install-arch-dep
FILESDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
-PATCHDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/patches
-PKGDIR?= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg
+PATCHDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
+PKGDIR?= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule
SLAVEDIRS= editors/xemacs21-mule-common editors/xemacs21-mule-sumo
diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index 1e5e599249dc..0830eb525c54 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -10,8 +10,8 @@ CATEGORIES= japanese
RUN_DEPENDS= wish4.2jp:${PORTSDIR}/japanese/tk42
MASTERDIR= ${.CURDIR}/../../misc/ewipe
-PATCHDIR= ${.CURDIR}/patches
-COMMENT= ${.CURDIR}/pkg/COMMENT
+PATCHDIR= ${.CURDIR}/files
+COMMENT= ${.CURDIR}/pkg-comment
KANJI= yes
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index 66b515fe9f06..3290f18f3a78 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -14,9 +14,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION}+onew2.2.10
MAINTAINER= taoka@FreeBSD.org
-PATCHDIR= ${.CURDIR}/../jvim/patches
+PATCHDIR= ${.CURDIR}/../jvim/files
FILESDIR= ${.CURDIR}/../jvim/files
-PLIST= ${.CURDIR}/../jvim/pkg/PLIST
+PLIST= ${.CURDIR}/../jvim/pkg-plist
MANLANG= ja
MAN1= jcat.1 jfold.1 jgrep.1 jvim.1
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index c4d27846df16..097f8f803fad 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -19,9 +19,9 @@ MAINTAINER= taoka@FreeBSD.org
USE_XLIB= yes
NO_LATEST_LINK= YES # waiting for jgrep, jfold, jcat
-PATCHDIR= ${.CURDIR}/../jvim3/patches
+PATCHDIR= ${.CURDIR}/../jvim3/files
FILESDIR= ${.CURDIR}/../jvim3/files
-PLIST= ${.CURDIR}/../jvim3/pkg/PLIST
+PLIST= ${.CURDIR}/../jvim3/pkg-plist
EXTRACT_ONLY= vim-3.0.tar.gz
WRKSRC= ${WRKDIR}/vim
MAKEFILE= makjunix.mak
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 73bf95a372b0..a9fdd38ab4df 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= taoka@FreeBSD.org
LIB_DEPENDS= ${LIB_INPUT_METHOD}
BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
-PATCHDIR= ${.CURDIR}/../kinput2-freewnn/patches
+PATCHDIR= ${.CURDIR}/../kinput2-freewnn/files
FILESDIR= ${.CURDIR}/../kinput2-freewnn/files
USE_IMAKE= yes
MAN1= kinput2.1
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 73bf95a372b0..a9fdd38ab4df 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= taoka@FreeBSD.org
LIB_DEPENDS= ${LIB_INPUT_METHOD}
BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
-PATCHDIR= ${.CURDIR}/../kinput2-freewnn/patches
+PATCHDIR= ${.CURDIR}/../kinput2-freewnn/files
FILESDIR= ${.CURDIR}/../kinput2-freewnn/files
USE_IMAKE= yes
MAN1= kinput2.1
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index 919100bc87db..c2adcd37401b 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -12,8 +12,8 @@ DISTNAME= communicator-ja-euc-v475-export.generic-generic-generic
MASTERDIR= ${.CURDIR}/../netscape4-communicator
SUBMASTERDIR= ${.CURDIR}/../netscape${BROWSER_VER}-communicator
FILESDIR= ${SUBMASTERDIR}/files
-PATCHDIR= ${SUBMASTERDIR}/patches
-PKGDIR= ${SUBMASTERDIR}/pkg
+PATCHDIR= ${SUBMASTERDIR}/files
+PKGDIR= ${SUBMASTERDIR}
BROWSER_VER= 47
BROWSER_VERSION= 4.75
diff --git a/korean/netscape47-communicator/Makefile b/korean/netscape47-communicator/Makefile
index cbfde9ca05f3..d640ba509a67 100644
--- a/korean/netscape47-communicator/Makefile
+++ b/korean/netscape47-communicator/Makefile
@@ -8,8 +8,8 @@
MASTERDIR= ${.CURDIR}/../netscape4-communicator
SUBMASTERDIR= ${.CURDIR}/../netscape${BROWSER_VER}-communicator
FILESDIR= ${SUBMASTERDIR}/files
-PATCHDIR= ${SUBMASTERDIR}/patches
-PKGDIR= ${SUBMASTERDIR}/pkg
+PATCHDIR= ${SUBMASTERDIR}/files
+PKGDIR= ${SUBMASTERDIR}
BROWSER_VER= 47
BROWSER_VERSION= 4.75
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index a65ee770f6d0..a88806898d78 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -39,7 +39,7 @@ PLIST_SUB= EMACS_LISPDIR=${EMACS_LISPDIR} \
EMACS_ETCDIR=${EMACS_ETCDIR} \
EMACS_INFODIR=${EMACS_INFODIR} \
EMACS_PKGDIR=${EMACS_PKGDIR}
-PATCHDIR= ${.CURDIR}/../mew/patches
+PATCHDIR= ${.CURDIR}/../mew/files
SCRIPTDIR= ${.CURDIR}/../mew/scripts
FILESDIR= ${.CURDIR}/../mew/files
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index a18f29702d46..9a536f3883d9 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -32,11 +32,11 @@ LDAP_PATCH_DATE= 20000701
# Local overrides
MASTERDIR= ${PORTSDIR}/mail/qmail
#MASTERDIR= ${.CURDIR}/../qmail
-PATCHDIR= ${.CURDIR}/patches
-PKGDIR_LOCAL= ${.CURDIR}/pkg
-DESCR= ${PKGDIR_LOCAL}/DESCR
-PLIST= ${PKGDIR_LOCAL}/PLIST
-PKGMESSAGE= ${PKGDIR_LOCAL}/MESSAGE
+PATCHDIR= ${.CURDIR}/files
+PKGDIR_LOCAL= ${.CURDIR}
+DESCR= ${PKGDIR_LOCAL}/pkg-descr
+PLIST= ${PKGDIR_LOCAL}/pkg-plist
+PKGMESSAGE= ${PKGDIR_LOCAL}/pkg-message
PRE_MK_INCLUDED= yes
diff --git a/print/gp/Makefile b/print/gp/Makefile
index 09accddf7c6f..7774c784a55c 100644
--- a/print/gp/Makefile
+++ b/print/gp/Makefile
@@ -13,7 +13,7 @@ DISTNAME= GP-2.5p2
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
-PATCHDIR= ${.CURDIR}/../../print/gp/patches
+PATCHDIR= ${.CURDIR}/../../print/gp/files
FILESDIR= ${.CURDIR}/../../print/gp/files
SCRIPTDIR= ${.CURDIR}/../../print/gp/scripts
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 4fe6870579d1..bdd991ca87c6 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 5b8249a567a1..82cf3788e8aa 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 58ebc070f475..ac706d919f10 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index d4371159e156..683c0f893f7b 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index d4371159e156..683c0f893f7b 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index b727a399e5e0..f2ad3f856a91 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 549860bcac13..49b1db6e5362 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -38,7 +38,7 @@ BINOWN= root
BINGRP= wheel
MASTERDIR?= ${.CURDIR}/../XttXF86srv-common
FILESDIR= ${MASTERDIR}/files
-PATCHDIR= ${MASTERDIR}/patches
+PATCHDIR= ${MASTERDIR}/files
.if defined(USE_SHARED_WRKSRC)
WRKDIR= ${MASTERDIR}/work
.endif
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index fe67f74562e4..68a240fb23ed 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -19,7 +19,7 @@ XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/patches
+PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files
SCRIPTS_ENV+= PREFIX=${PREFIX} \
X11BASE=${X11BASE} \
WRKDIR=${WRKDIR} \