diff options
author | taoka <taoka@FreeBSD.org> | 2000-12-14 22:46:15 +0800 |
---|---|---|
committer | taoka <taoka@FreeBSD.org> | 2000-12-14 22:46:15 +0800 |
commit | 71659045cb84338d7fad4741bbcb096a9299cbbd (patch) | |
tree | d015453a1a5a2d6366a0a6678bacefcc77e7eacf | |
parent | 5289540120c10245e13a7f707d0e16a3b86ed33c (diff) | |
download | freebsd-ports-gnome-71659045cb84338d7fad4741bbcb096a9299cbbd.tar.gz freebsd-ports-gnome-71659045cb84338d7fad4741bbcb096a9299cbbd.tar.zst freebsd-ports-gnome-71659045cb84338d7fad4741bbcb096a9299cbbd.zip |
(1) When I committed ports of pips{2200,3000,3300,670,750,900},
I must commit modification for pips800 which is a master port for these.
I forgot it.
(2) Simplify slave ports in japapese
(modifying Makefile and deleting pkg-plist).
-rw-r--r-- | japanese/pips2200/Makefile | 4 | ||||
-rw-r--r-- | japanese/pips3000/Makefile | 4 | ||||
-rw-r--r-- | japanese/pips3300/Makefile | 4 | ||||
-rw-r--r-- | japanese/pips670/Makefile | 4 | ||||
-rw-r--r-- | japanese/pips750_2000/Makefile | 4 | ||||
-rw-r--r-- | japanese/pips760/Makefile | 5 | ||||
-rw-r--r-- | japanese/pips760/pkg-plist | 1 | ||||
-rw-r--r-- | japanese/pips770/Makefile | 5 | ||||
-rw-r--r-- | japanese/pips770/pkg-plist | 1 | ||||
-rw-r--r-- | japanese/pips800/Makefile | 17 | ||||
-rw-r--r-- | japanese/pips820_3300/pkg-plist | 1 | ||||
-rw-r--r-- | japanese/pips900/Makefile | 4 | ||||
-rw-r--r-- | print/pips2200/Makefile | 4 | ||||
-rw-r--r-- | print/pips3000/Makefile | 4 | ||||
-rw-r--r-- | print/pips3300/Makefile | 4 | ||||
-rw-r--r-- | print/pips670/Makefile | 4 | ||||
-rw-r--r-- | print/pips750_2000/Makefile | 4 | ||||
-rw-r--r-- | print/pips760/Makefile | 3 | ||||
-rw-r--r-- | print/pips770/Makefile | 3 | ||||
-rw-r--r-- | print/pips800/Makefile | 31 | ||||
-rw-r--r-- | print/pips800/pkg-plist | 3 | ||||
-rw-r--r-- | print/pips820_3300/Makefile | 3 | ||||
-rw-r--r-- | print/pips900/Makefile | 4 |
23 files changed, 47 insertions, 74 deletions
diff --git a/japanese/pips2200/Makefile b/japanese/pips2200/Makefile index b0cda07d54a6..981cb649c3af 100644 --- a/japanese/pips2200/Makefile +++ b/japanese/pips2200/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 2200 do-install: # empty diff --git a/japanese/pips3000/Makefile b/japanese/pips3000/Makefile index c18aae2c4226..c0ab6dc7f11d 100644 --- a/japanese/pips3000/Makefile +++ b/japanese/pips3000/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 3000 do-install: # empty diff --git a/japanese/pips3300/Makefile b/japanese/pips3300/Makefile index 76c0ec1f68e1..6fd8ef1d2515 100644 --- a/japanese/pips3300/Makefile +++ b/japanese/pips3300/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 3300 do-install: # empty diff --git a/japanese/pips670/Makefile b/japanese/pips670/Makefile index e47db82b74fb..384a7b283590 100644 --- a/japanese/pips670/Makefile +++ b/japanese/pips670/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 670 do-install: # empty diff --git a/japanese/pips750_2000/Makefile b/japanese/pips750_2000/Makefile index 769384de09b3..3cb1606aa9ef 100644 --- a/japanese/pips750_2000/Makefile +++ b/japanese/pips750_2000/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 750_2000 do-install: # empty diff --git a/japanese/pips760/Makefile b/japanese/pips760/Makefile index f51cb61eac7b..9b36eb6573af 100644 --- a/japanese/pips760/Makefile +++ b/japanese/pips760/Makefile @@ -2,13 +2,10 @@ # Date created: 2000.08.04 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.2 2000-10-08 10:21:15 asami Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.3 2000-12-14 14:46:13 taoka Exp $ # -CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 760 do-install: # empty diff --git a/japanese/pips760/pkg-plist b/japanese/pips760/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/japanese/pips760/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/japanese/pips770/Makefile b/japanese/pips770/Makefile index d8072e876200..74d81504d381 100644 --- a/japanese/pips770/Makefile +++ b/japanese/pips770/Makefile @@ -2,13 +2,10 @@ # Date created: 00/04/21 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.2 2000-10-08 10:21:16 asami Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.3 2000-12-14 14:46:14 taoka Exp $ # -CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 770 do-install: # empty diff --git a/japanese/pips770/pkg-plist b/japanese/pips770/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/japanese/pips770/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/japanese/pips800/Makefile b/japanese/pips800/Makefile index 50e32a5fc927..9c83ac1d279b 100644 --- a/japanese/pips800/Makefile +++ b/japanese/pips800/Makefile @@ -2,22 +2,26 @@ # Date created: 00/04/18 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips800/Attic/Makefile,v 1.1.1.1 2000-09-01 16:28:23 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips800/Attic/Makefile,v 1.2 2000-12-14 14:46:14 taoka Exp $ # PORTNAME= pips${PRTYPE} -PORTVERSION= 1.2 -CATEGORIES?= japanese print linux +PORTVERSION?= 1.2 +CATEGORIES= japanese print linux MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS= /compat/linux/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale + PREFIX= /compat/linux NO_BUILD= yes USE_PERL5= yes ONLY_FOR_ARCHS= i386 +# for slave ports +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr .include <bsd.port.pre.mk> @@ -31,12 +35,17 @@ do-install: # empty # target for maintainer _MAKE_COMMENT_DESCR: .if ${PRTYPE} != 800 -.for file in pkg/COMMENT pkg/DESCR +.for file in pkg-comment pkg-descr .if ${PRTYPE} == 820_3300 ${SED} -e 's/PM-800C/PM-820C PM-3300C/g' \ -e 's/pm800c/pm820c_3300c/g' \ -e 's/800/${PRTYPE}/g' \ ${MASTERDIR}/${file} > ${.CURDIR}/${file} +.elif ${PRTYPE} == 750_2000 + ${SED} -e 's/PM-800C/PM-750C PM-2000C/g' \ + -e 's/pm800c/pm750c_2000c/g' \ + -e 's/800/${PRTYPE}/g' \ + ${MASTERDIR}/${file} > ${.CURDIR}/${file} .else ${SED} -e 's/800/${PRTYPE}/g' ${MASTERDIR}/${file} \ > ${.CURDIR}/${file} diff --git a/japanese/pips820_3300/pkg-plist b/japanese/pips820_3300/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/japanese/pips820_3300/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/japanese/pips900/Makefile b/japanese/pips900/Makefile index afae7a6f55f4..9cc6de2bf15d 100644 --- a/japanese/pips900/Makefile +++ b/japanese/pips900/Makefile @@ -5,10 +5,8 @@ # $FreeBSD$ # -CATEGORIES?= japanese print linux +PORTVERSION= 1.3 MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 900 do-install: # empty diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile index 5f42dbc264f5..c8550facb6e6 100644 --- a/print/pips2200/Makefile +++ b/print/pips2200/Makefile @@ -5,12 +5,8 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 2200 .include "${MASTERDIR}/Makefile" diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile index 35b296c2ed9c..344abdf4eba0 100644 --- a/print/pips3000/Makefile +++ b/print/pips3000/Makefile @@ -5,12 +5,8 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 3000 .include "${MASTERDIR}/Makefile" diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile index 2b1e018f5505..0fa87164e974 100644 --- a/print/pips3300/Makefile +++ b/print/pips3300/Makefile @@ -5,12 +5,8 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 3300 .include "${MASTERDIR}/Makefile" diff --git a/print/pips670/Makefile b/print/pips670/Makefile index 803f1abd1d94..79f10e9d9a37 100644 --- a/print/pips670/Makefile +++ b/print/pips670/Makefile @@ -5,12 +5,8 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 670 .include "${MASTERDIR}/Makefile" diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile index c2b018723cb4..8fd4663b870e 100644 --- a/print/pips750_2000/Makefile +++ b/print/pips750_2000/Makefile @@ -5,13 +5,9 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -#MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/750/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 750_2000 .include "${MASTERDIR}/Makefile" diff --git a/print/pips760/Makefile b/print/pips760/Makefile index ea5d531be6f8..56d5f6c15110 100644 --- a/print/pips760/Makefile +++ b/print/pips760/Makefile @@ -5,10 +5,7 @@ # $FreeBSD$ # -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 760 .include "${MASTERDIR}/Makefile" diff --git a/print/pips770/Makefile b/print/pips770/Makefile index 1d0d06de576a..1065c884da80 100644 --- a/print/pips770/Makefile +++ b/print/pips770/Makefile @@ -5,10 +5,7 @@ # $FreeBSD$ # -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 770 .include "${MASTERDIR}/Makefile" diff --git a/print/pips800/Makefile b/print/pips800/Makefile index c2ee82d551b5..9c2b12e9aa03 100644 --- a/print/pips800/Makefile +++ b/print/pips800/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pips${PRTYPE} -PORTVERSION= 1.2 -CATEGORIES= print linux -MASTER_SITES?= http://www.epkowa.on.arena.ne.jp/pips/data/800/ +PORTVERSION?= 1.2 +CATEGORIES?= print linux +MASTER_SITES?= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ DISTNAME?= ${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .i386.tgz @@ -20,11 +20,20 @@ RUN_DEPENDS+= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \ ONLY_FOR_ARCHS= i386 NO_WRKSUBDIR= yes -PLIST_SUB= BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} +PLIST_SUB= BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} LIB_DIR_FILE=usr/lib/${LIB_FILE} LIB_README=${LIB_NAME} MD5_FILE= ${.CURDIR}/distinfo - +.if (${PORTVERSION} == 1.2) +LIB_FILE= libPrt${PRTYPE}.so +LIB_NAME= "@comment Readme of the Lib for only 1.3 or later" +.else +LIB_FILE= libpm${PRTYPE}c.so +LIB_NAME= share/doc/${BASE_NAME}/libpm${PRTYPE}c.readme +.endif BASE_NAME= pips${PRTYPE} PAPERSIZE?= a4 +# for slave ports +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr .include <bsd.port.pre.mk> PRTYPE?= 800 @@ -47,16 +56,19 @@ do-install: # ${INSTALL_SCRIPT} ${FILESDIR}/pips_filter ${PREFIX}/libexec/${BASE_NAME} ${INSTALL_DATA} ${WRKSRC}/gsconfig${PRTYPE} ${PREFIX}/libexec/${BASE_NAME} chmod +x ${PREFIX}/libexec/${BASE_NAME}/gsconfig${PRTYPE} - ${INSTALL_DATA} ${WRKSRC}/libPrt${PRTYPE}.so /compat/linux/usr/lib/ + ${INSTALL_DATA} ${WRKSRC}/${LIB_FILE} /compat/linux/usr/lib/ -/compat/linux/sbin/ldconfig ${INSTALL_DATA} ${WRKSRC}/pips${PRTYPE} ${PREFIX}/bin ${CHMOD} +x ${PREFIX}/bin/pips${PRTYPE} .if !defined(NOPORTSDOCS) ${MKDIR} ${PREFIX}/share/doc/${BASE_NAME} ${INSTALL_DATA} ${WRKSRC}/readme${PRTYPE} ${PREFIX}/share/doc/${BASE_NAME} +.if (${PORTVERSION} != 1.2) + ${INSTALL_DATA} ${WRKSRC}/libpm${PRTYPE}c.readme ${PREFIX}/share/doc/${BASE_NAME} +.endif .endif -# target for maintainer +# a target for the maintainer _MAKE_COMMENT_DESCR: .if ${PRTYPE} != 800 .for file in pkg-comment pkg-descr @@ -65,6 +77,11 @@ _MAKE_COMMENT_DESCR: -e 's/pm800c/pm820c_3300c/g' \ -e 's/800/${PRTYPE}/g' \ ${MASTERDIR}/${file} > ${.CURDIR}/${file} +.elif ${PRTYPE} == 750_2000 + ${SED} -e 's/PM-800C/PM-750C PM-2000C/g' \ + -e 's/pm800c/pm750c_2000c/g' \ + -e 's/800/${PRTYPE}/g' \ + ${MASTERDIR}/${file} > ${.CURDIR}/${file} .else ${SED} -e 's/800/${PRTYPE}/g' ${MASTERDIR}/${file} \ > ${.CURDIR}/${file} diff --git a/print/pips800/pkg-plist b/print/pips800/pkg-plist index 345cfec523d2..3c5261cd2671 100644 --- a/print/pips800/pkg-plist +++ b/print/pips800/pkg-plist @@ -3,8 +3,9 @@ libexec/%%BASE_NAME%%/filter%%PRTYPE%% libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%% share/doc/%%BASE_NAME%%/readme%%PRTYPE%% +%%LIB_README%% @dirrm libexec/%%BASE_NAME%% @dirrm share/doc/%%BASE_NAME%% @cwd /compat/linux -usr/lib/libPrt%%PRTYPE%%.so +%%LIB_DIR_FILE%% @exec /compat/linux/sbin/ldconfig ; true diff --git a/print/pips820_3300/Makefile b/print/pips820_3300/Makefile index 7c9bb90cf87f..43bfed2b07de 100644 --- a/print/pips820_3300/Makefile +++ b/print/pips820_3300/Makefile @@ -6,10 +6,7 @@ # MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S,_3300,,}/ - MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 820_3300 .include "${MASTERDIR}/Makefile" diff --git a/print/pips900/Makefile b/print/pips900/Makefile index 63064c632e9d..5bb17242d993 100644 --- a/print/pips900/Makefile +++ b/print/pips900/Makefile @@ -5,12 +5,8 @@ # $FreeBSD$ # -CATEGORIES= print linux PORTVERSION= 1.3 -MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg-comment -DESCR= ${.CURDIR}/pkg-descr PRTYPE= 900 .include "${MASTERDIR}/Makefile" |