Index: Mk/bsd.options.mk =================================================================== --- Mk/bsd.options.mk +++ Mk/bsd.options.mk @@ -127,7 +127,6 @@ OPTIONSMKINCLUDED= bsd.options.mk OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} -OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ @@ -235,22 +234,6 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -265,14 +248,6 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX to remove once UNIQUENAME is removed -## options files (from dialog) -. if exists(${OPTIONSFILE}) && !make(rmconfig) -. include "${OPTIONSFILE}" -. endif -. sinclude "${OPTIONSFILE}.local" -# XXX to remove once UNIQUENAME is removed - ## options files (from dialog) . if exists(${OPTIONS_FILE}) && !make(rmconfig) . include "${OPTIONS_FILE}" @@ -346,22 +321,6 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor -# XXX To remove once UNIQUENAME will be removed -## Set the options specified per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_SET_FORCE} -. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) -PORT_OPTIONS+= ${opt} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endif -. endfor - -## Unset the options excluded per-port (set by user in make.conf) -. for opt in ${${UNIQUENAME}_UNSET_FORCE} -PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} -NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} -. endfor -# XXX To remove once UNIQUENAME will be removed - ## Set the options specified per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_SET_FORCE} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -888,7 +888,7 @@ # directories to be searched for shared libraries. # Otherwise, this is a list of directories to be added to that # list. The directory names are written to -# ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME} which is then +# ${LOCALBASE}/libdata/ldconfig/${PKGBASE} which is then # used by the ldconfig startup script. # This mechanism replaces ldconfig scripts installed by some # ports, often under such names as 000.${UNQUENAME}.sh. @@ -897,7 +897,7 @@ # version, and the directory list given will be ignored. # USE_LDCONFIG32 # - Same as USE_LDCONFIG but the target file is -# ${LOCALBASE}/libdata/ldconfig32/${UNIQUENAME} instead. +# ${LOCALBASE}/libdata/ldconfig32/${PKGBASE} instead. # Note: that should only be used on 64-bit architectures. # # DOCSDIR - Name of the directory to install the packages docs in. @@ -2877,7 +2877,7 @@ ################################################################ .if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \ && !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \ - || defined(CONFIG_DONE_${UNIQUENAME:tu}) || \ + || defined(CONFIG_DONE_${PKGBASE:tu}) || \ defined(PACKAGE_BUILDING) || defined(BATCH)) _OPTIONS_OK=yes .endif @@ -3558,8 +3558,8 @@ @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -3570,8 +3570,8 @@ @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} + @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST} .endif .endif .endif @@ -5617,7 +5617,7 @@ ${target}: ${${target:tu}_COOKIE} .elif !target(${target}) ${target}: config-conditional - @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE} + @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${PKGBASE:tu}=1 ${${target:tu}_COOKIE} .elif target(${target}) && defined(IGNORE) .endif Index: audio/lua51-mpd/Makefile =================================================================== --- audio/lua51-mpd/Makefile +++ audio/lua51-mpd/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket OPTIONS_DEFINE= DOCS -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} GH_ACCOUNT= silentbicycle GH_PROJECT= lua-mpd Index: databases/mariadb-client/Makefile =================================================================== --- databases/mariadb-client/Makefile +++ databases/mariadb-client/Makefile @@ -4,8 +4,6 @@ PORTREVISION= 7 PKGNAMESUFFIX= 53-client -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server Index: databases/mariadb-scripts/Makefile =================================================================== --- databases/mariadb-scripts/Makefile +++ databases/mariadb-scripts/Makefile @@ -7,7 +7,6 @@ LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} USES= perl5 MASTERDIR= ${.CURDIR}/../mariadb-server Index: databases/mariadb-server/Makefile =================================================================== --- databases/mariadb-server/Makefile +++ databases/mariadb-server/Makefile @@ -20,8 +20,6 @@ LICENSE= GPLv2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - CONFLICTS?= mariadb5[4-9]-server-* \ mariadb1[0-9][0-9]-server-* \ mysql*-server-* \ Index: databases/squirrel-sql/Makefile =================================================================== --- databases/squirrel-sql/Makefile +++ databases/squirrel-sql/Makefile @@ -20,7 +20,7 @@ SUB_FILES= squirrel-sql -DATADIR= ${PREFIX}/share/java/${UNIQUENAME} +DATADIR= ${PREFIX}/share/java/${PKGBASE} DESKTOP_ENTRIES="Squirrel-SQL Client" \ "${COMMENT}" \ Index: deskutils/gworkspace-gwmetadata/Makefile =================================================================== --- deskutils/gworkspace-gwmetadata/Makefile +++ deskutils/gworkspace-gwmetadata/Makefile @@ -22,7 +22,6 @@ USE_SQLITE= yes LDFLAGS+= -lpthread -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata CONFIGURE_ARGS+= --with-sqlite-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-sqlite-library=${LOCALBASE}/lib Index: devel/cl-asdf/bsd.cl-asdf.mk =================================================================== --- devel/cl-asdf/bsd.cl-asdf.mk +++ devel/cl-asdf/bsd.cl-asdf.mk @@ -8,7 +8,7 @@ # CL_LIBDIR_REL - Common Lisp library directory, relative to LOCALBASE or PREFIX # ASDF_PATHNAME - Where to install compiled FASL files (depends on FASL_DIR_REL) # ASDF_REGISTRY - Path to ASDF registry -# DOCSDIR - DOCSDIR using UNIQUENAME (to account for optional cl- PKGNAMEPREFIX) +# DOCSDIR - DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX) # EXAMPLESDIR - Same as above, for EXAMPLESDIR # FASL_DIR_REL - Relative path to compiled FASL files; depends on FASL_TARGET # FASL_TARGET - Platform for building FASL files (currently "sbcl" or "clisp") @@ -32,8 +32,8 @@ ASDF_REGISTRY= ${PREFIX}/${CL_LIBDIR_REL}/system-registry # Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} .if defined(FASL_TARGET) FASL_DIR_REL= ${FASL_TARGET}fasl Index: devel/llvm-cheri/Makefile =================================================================== --- devel/llvm-cheri/Makefile +++ devel/llvm-cheri/Makefile @@ -14,7 +14,6 @@ COMMAND_SUFFIX= DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib Index: devel/llvm-devel/Makefile =================================================================== --- devel/llvm-devel/Makefile +++ devel/llvm-devel/Makefile @@ -14,7 +14,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 USE_LDCONFIG= ${LLVM_PREFIX}/lib Index: devel/llvm33/Makefile =================================================================== --- devel/llvm33/Makefile +++ devel/llvm33/Makefile @@ -15,7 +15,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= execinfo gmake perl5 GNU_CONFIGURE= yes Index: devel/llvm34/Makefile =================================================================== --- devel/llvm34/Makefile +++ devel/llvm34/Makefile @@ -15,7 +15,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${PORTVERSION}.src Index: devel/llvm35/Makefile =================================================================== --- devel/llvm35/Makefile +++ devel/llvm35/Makefile @@ -15,7 +15,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src Index: devel/llvm36/Makefile =================================================================== --- devel/llvm36/Makefile +++ devel/llvm36/Makefile @@ -16,7 +16,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} WRKSRC= ${WRKDIR}/llvm-${DISTVERSION}.src Index: devel/llvm37/Makefile =================================================================== --- devel/llvm37/Makefile +++ devel/llvm37/Makefile @@ -19,7 +19,6 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -UNIQUENAME= ${PORTNAME}${LLVM_SUFFIX} USES= cmake:outsource compiler:c++11-lib libedit ninja perl5 tar:xz USE_LDCONFIG= ${LLVM_PREFIX}/lib Index: devel/ocaml-camlp5/Makefile =================================================================== --- devel/ocaml-camlp5/Makefile +++ devel/ocaml-camlp5/Makefile @@ -8,7 +8,7 @@ http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/ PKGNAMEPREFIX= ocaml- -DIST_SUBDIR= ${UNIQUENAME} +DIST_SUBDIR= ${PKGBASE} PATCH_SITES= ${MASTER_SITES} Index: devel/php-memoize/Makefile =================================================================== --- devel/php-memoize/Makefile +++ devel/php-memoize/Makefile @@ -13,7 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= arraypad -GH_PROJECT= ${UNIQUENAME} +GH_PROJECT= ${PKGBASE} USE_PHP= yes USE_PHPEXT= yes Index: devel/py-funcparserlib/Makefile =================================================================== --- devel/py-funcparserlib/Makefile +++ devel/py-funcparserlib/Makefile @@ -17,7 +17,7 @@ USE_PYTHON= distutils autoplist PORTDOCS= README doc -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} OPTIONS_DEFINE= DOCS Index: dns/samba-nsupdate/Makefile =================================================================== --- dns/samba-nsupdate/Makefile +++ dns/samba-nsupdate/Makefile @@ -41,8 +41,8 @@ SIGCHASE_CONFIGURE_ARGS+= STD_CDEFINES="-DDIG_SIGCHASE=1" IPV6_CONFIGURE_ON= --enable-ipv6 -PLIST_FILES= bin/${UNIQUENAME} \ - man/man1/${UNIQUENAME}.1.gz +PLIST_FILES= bin/${PKGBASE} \ + man/man1/${PKGBASE}.1.gz .include @@ -76,11 +76,11 @@ -e 's|^.*check confgen ||' \ ${WRKSRC}/bin/Makefile.in @${REINPLACE_CMD} \ - -e 's|${PORTNAME}|${UNIQUENAME}|g' \ + -e 's|${PORTNAME}|${PKGBASE}|g' \ ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 do-install: - ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 - ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${UNIQUENAME} + ${INSTALL_MAN} ${WRKSRC}/bin/nsupdate/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nsupdate/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include Index: editors/2bsd-vi/Makefile =================================================================== --- editors/2bsd-vi/Makefile +++ editors/2bsd-vi/Makefile @@ -17,7 +17,7 @@ USES= tar:bzip2 -PRESERVEDIR= /var/preserve/${UNIQUENAME} +PRESERVEDIR= /var/preserve/${PKGBASE} PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}" post-extract: .SILENT Index: editors/libreoffice-i18n/Makefile =================================================================== --- editors/libreoffice-i18n/Makefile +++ editors/libreoffice-i18n/Makefile @@ -2,7 +2,6 @@ .include "${.CURDIR}/../libreoffice/Makefile.common" PORTREVISION= 0 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PKGNAMESUFFIX= -i18n DISTFILES= #none MASTER_SITES= #none Index: emulators/generator-cbiere/Makefile =================================================================== --- emulators/generator-cbiere/Makefile +++ emulators/generator-cbiere/Makefile @@ -19,14 +19,14 @@ USE_GNOME= gtk12 USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${UNIQUENAME}/ \ +CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}/ \ --with-gtk MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/${UNIQUENAME}-gtk +PLIST_FILES= bin/${PORTNAME}-gtk OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL OPTIONS_DEFINE_i386= RAZE Index: emulators/i386-wine-devel/Makefile.inc =================================================================== --- emulators/i386-wine-devel/Makefile.inc +++ emulators/i386-wine-devel/Makefile.inc @@ -28,7 +28,7 @@ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}-${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 Index: emulators/i386-wine/Makefile.inc =================================================================== --- emulators/i386-wine/Makefile.inc +++ emulators/i386-wine/Makefile.inc @@ -28,7 +28,7 @@ EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${UNIQUENAME} \ + --exclude libdata/ldconfig32/${PKGNAMEPREFIX}-${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 Index: emulators/virtualbox-ose-additions/Makefile =================================================================== --- emulators/virtualbox-ose-additions/Makefile +++ emulators/virtualbox-ose-additions/Makefile @@ -22,7 +22,6 @@ CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice Index: emulators/virtualbox-ose-kmod/Makefile =================================================================== --- emulators/virtualbox-ose-kmod/Makefile +++ emulators/virtualbox-ose-kmod/Makefile @@ -22,7 +22,6 @@ CPE_PRODUCT= vm_virtualbox USES= cpe kmod tar:bzip2 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxnet Index: games/ioquake3-devel-server/Makefile =================================================================== --- games/ioquake3-devel-server/Makefile +++ games/ioquake3-devel-server/Makefile @@ -7,7 +7,6 @@ MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 development snapshot dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS Index: games/ioquake3-server/Makefile =================================================================== --- games/ioquake3-server/Makefile +++ games/ioquake3-server/Makefile @@ -7,7 +7,6 @@ MAINTAINER= kamikaze@bsdforen.de COMMENT= Ioquake3 dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS Index: games/iourbanterror-server/Makefile =================================================================== --- games/iourbanterror-server/Makefile +++ games/iourbanterror-server/Makefile @@ -7,7 +7,6 @@ MAINTAINER= kamikaze@bsdforen.de COMMENT= Urban Terror dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER Index: games/openarena-server/Makefile =================================================================== --- games/openarena-server/Makefile +++ games/openarena-server/Makefile @@ -7,7 +7,6 @@ MAINTAINER= kamikaze@bsdforen.de COMMENT= OpenArena dedicated server -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER Index: games/xpilot-ng-server/Makefile =================================================================== --- games/xpilot-ng-server/Makefile +++ games/xpilot-ng-server/Makefile @@ -23,8 +23,6 @@ CONFIGURE_ARGS= --program-prefix="" -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PKGFILESUFFIX= ${PKGNAMESUFFIX:S/-/./} DESCR= ${PKGDIR}/pkg-descr${PKGFILESUFFIX} PLIST= ${PKGDIR}/pkg-plist${PKGFILESUFFIX} Index: graphics/py-aafigure/Makefile =================================================================== --- graphics/py-aafigure/Makefile +++ graphics/py-aafigure/Makefile @@ -19,8 +19,8 @@ USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.txt PORTEXAMPLES= * Index: graphics/py-actdiag/Makefile =================================================================== --- graphics/py-actdiag/Makefile +++ graphics/py-actdiag/Makefile @@ -20,7 +20,7 @@ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README.rst OPTIONS_DEFINE= DOCS Index: graphics/py-blockdiag/Makefile =================================================================== --- graphics/py-blockdiag/Makefile +++ graphics/py-blockdiag/Makefile @@ -17,8 +17,6 @@ ${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \ ${PKGNAMEPREFIX}webcolors>=0:${PORTSDIR}/graphics/py-webcolors -UNIQUENAME= py-${PORTNAME} - USES= python USE_PYTHON= autoplist distutils Index: graphics/py-imaging/Makefile =================================================================== --- graphics/py-imaging/Makefile +++ graphics/py-imaging/Makefile @@ -16,8 +16,6 @@ LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ libfreetype.so:${PORTSDIR}/print/freetype2 -UNIQUENAME= py-${PORTNAME} - USES= jpeg python DIST_SUBDIR= python USE_PYTHON= distutils autoplist concurrent Index: graphics/py-nwdiag/Makefile =================================================================== --- graphics/py-nwdiag/Makefile +++ graphics/py-nwdiag/Makefile @@ -20,8 +20,8 @@ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * Index: graphics/py-seqdiag/Makefile =================================================================== --- graphics/py-seqdiag/Makefile +++ graphics/py-seqdiag/Makefile @@ -20,8 +20,8 @@ USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} PORTDOCS= README.rst PORTEXAMPLES= * Index: graphics/py-webcolors/Makefile =================================================================== --- graphics/py-webcolors/Makefile +++ graphics/py-webcolors/Makefile @@ -15,7 +15,7 @@ USES= python USE_PYTHON= distutils autoplist -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README OPTIONS_DEFINE= DOCS Index: graphics/quat-gui/Makefile =================================================================== --- graphics/quat-gui/Makefile +++ graphics/quat-gui/Makefile @@ -18,8 +18,6 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USE_XORG= xext USE_GL= gl glut GNU_CONFIGURE= yes @@ -29,7 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= * PLIST_FILES= bin/quat @@ -51,7 +49,7 @@ ${WRKSRC}/gui/Makefile.in @${REINPLACE_CMD} -e \ 's||| ; \ - s|/doc/quat/|/doc/${UNIQUENAME}/|' \ + s|/doc/quat/|/doc/${PKGBASE}/|' \ ${WRKSRC}/gui/MainWindow.cxx # disable data file installation since distfile does not do # The Right Thing(TM) @@ -60,7 +58,7 @@ s|^(SUBDIRS.*)doc|\1|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ - 's|@PACKAGE@|${UNIQUENAME}|' \ + 's|@PACKAGE@|${PKGBASE}|' \ ${WRKSRC}/doc/Makefile.in post-install: Index: java/netty/Makefile =================================================================== --- java/netty/Makefile +++ java/netty/Makefile @@ -17,8 +17,8 @@ CPE_VENDOR= netty_project JAVA_VERSION= 1.6+ NO_BUILD= yes -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.Final PLIST_FILES= %%JAVAJARDIR%%/netty-${PORTVERSION}.jar \ Index: java/openjdk6-jre/Makefile =================================================================== --- java/openjdk6-jre/Makefile +++ java/openjdk6-jre/Makefile @@ -7,6 +7,5 @@ BUILD_JRE= yes MASTERDIR= ${.CURDIR}/../openjdk6 -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} .include "${MASTERDIR}/Makefile" Index: lang/gcc46/Makefile =================================================================== --- lang/gcc46/Makefile +++ lang/gcc46/Makefile @@ -26,7 +26,6 @@ .endif CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. Index: lang/gcc47/Makefile =================================================================== --- lang/gcc47/Makefile +++ lang/gcc47/Makefile @@ -27,7 +27,6 @@ CONFLICTS= gcc-4.7.* CPE_VENDOR= gnu -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. Index: lang/gcc48/Makefile =================================================================== --- lang/gcc48/Makefile +++ lang/gcc48/Makefile @@ -26,7 +26,6 @@ CONFLICTS= gcc-4.8.* CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. Index: lang/gcc49/Makefile =================================================================== --- lang/gcc49/Makefile +++ lang/gcc49/Makefile @@ -25,7 +25,6 @@ CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of Index: lang/gcc5-devel/Makefile =================================================================== --- lang/gcc5-devel/Makefile +++ lang/gcc5-devel/Makefile @@ -25,7 +25,6 @@ CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of Index: lang/gcc5/Makefile =================================================================== --- lang/gcc5/Makefile +++ lang/gcc5/Makefile @@ -26,7 +26,6 @@ CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of Index: lang/gcc6-devel/Makefile =================================================================== --- lang/gcc6-devel/Makefile +++ lang/gcc6-devel/Makefile @@ -25,7 +25,6 @@ CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of Index: mail/addresses-goodies/Makefile =================================================================== --- mail/addresses-goodies/Makefile +++ mail/addresses-goodies/Makefile @@ -20,7 +20,6 @@ libAddresses.so:${PORTSDIR}/mail/addresses USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies post-patch: Index: mail/p5-IMAP-Admin/Makefile =================================================================== --- mail/p5-IMAP-Admin/Makefile +++ mail/p5-IMAP-Admin/Makefile @@ -14,7 +14,7 @@ USES= perl5 USE_PERL5= configure -EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUENAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} OPTIONS_DEFINE= EXAMPLES Index: mail/popa3d/Makefile =================================================================== --- mail/popa3d/Makefile +++ mail/popa3d/Makefile @@ -14,7 +14,6 @@ ALL_TARGET= popa3d PLIST= ${WRKDIR}/.PLIST.more CFLAGS+= -DPREFIX=${PREFIX} -UNIQUENAME= ${.CURDIR:T} OPTIONS_DEFINE= SMTP_AFTER_POP3 STANDALONE_POP3 SETPROCTITLE DOCS NO_OPTIONS_SORT=yes Index: math/py-matplotlib/Makefile =================================================================== --- math/py-matplotlib/Makefile +++ math/py-matplotlib/Makefile @@ -32,7 +32,6 @@ WXAGGBACKEND_DESC= WXAgg backend support PORTEXAMPLES= * -UNIQUENAME= ${PORTNAME} .include Index: math/vtk5/Makefile =================================================================== --- math/vtk5/Makefile +++ math/vtk5/Makefile @@ -7,7 +7,6 @@ CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ PKGNAMESUFFIX= 5 -UNIQUENAME= ${PKGBASE} MAINTAINER= ports@FreeBSD.org COMMENT= The Visualization Toolkit Index: math/vtk6/Makefile =================================================================== --- math/vtk6/Makefile +++ math/vtk6/Makefile @@ -23,8 +23,6 @@ # TODO # * VTK Groups -UNIQUENAME= ${PKGBASE} - CONFLICTS= vtk-4* USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt Index: misc/gnu-watch/Makefile =================================================================== --- misc/gnu-watch/Makefile +++ misc/gnu-watch/Makefile @@ -16,15 +16,15 @@ LDFLAGS+= -lncurses -PLIST_FILES= bin/${UNIQUENAME} man/man1/gnu-watch.1.gz +PLIST_FILES= bin/${PKGBASE} man/man1/gnu-watch.1.gz do-build: ${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \ - -o ${WRKSRC}/${UNIQUENAME} + -o ${WRKSRC}/${PKGBASE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${UNIQUENAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PKGBASE} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/watch.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1/${UNIQUENAME}.1 + ${STAGEDIR}${MANPREFIX}/man/man1/${PKGBASE}.1 .include Index: misc/nut/Makefile =================================================================== --- misc/nut/Makefile +++ misc/nut/Makefile @@ -3,6 +3,7 @@ PORTNAME= nut PORTVERSION= 20.1 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= SF PKGNAMEPREFIX= health- @@ -15,7 +16,7 @@ USES= gmake -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= CREDITS README nut.html OPTIONS_DEFINE= FLTK DOCS Index: net-im/py-xmpppy-yahoo/Makefile =================================================================== --- net-im/py-xmpppy-yahoo/Makefile +++ net-im/py-xmpppy-yahoo/Makefile @@ -26,10 +26,10 @@ FILES_CURPHOO= YahooMD5.py __init__.py cpformat.py md5crypt.py pysha.py yahoo_fn.py PFILES= ${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/.} \ ${FILES_CURPHOO:S.^.%%PYTHON_SITELIBDIR%%/xmpp/yahoo/curphoo/.} -PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${UNIQUENAME:S.-._.}.conf.sample +PLIST_FILES= ${PFILES} ${PFILES:S.$.c.} ${PFILES:S.$.o.} etc/${PKGBASE:S.-._.}.conf.sample SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} BINDIR=${PYTHON_SITELIBDIR}/xmpp/yahoo \ JABBER_USER=${JABBER_USER} -USE_RC_SUBR= ${UNIQUENAME:S/-/_/} +USE_RC_SUBR= ${PKGBASE:S/-/_/} DDIR= ${PYTHON_SITELIBDIR}/xmpp/yahoo .include @@ -45,7 +45,7 @@ post-patch: @${GREP} -lr '/usr/bin/env python' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin/env python|${PYTHON_CMD}|" - @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf|" \ + @${REINPLACE_CMD} -e "s|/etc/pyyimt.conf.xml|${PREFIX}/etc/${PKGBASE:S.-._.}.conf|" \ -e 's|pid = ""|pid = "/var/jabberd/pid/PyYIMt.pid"|g' \ -e 's|spoolFile = "user.dbm"|spoolFile = "/var/spool/jabberd/yahoouser.dbm"|g' \ ${WRKSRC}/config.py @@ -60,7 +60,7 @@ ${INSTALL_SCRIPT} ${WRKSRC}/yahoo.py ${STAGEDIR}${DDIR}/ @${MKDIR} ${STAGEDIR}${DDIR}/curphoo ${INSTALL_DATA} ${FILES_CURPHOO:S.^.${WRKSRC}/curphoo/.} ${STAGEDIR}${DDIR}/curphoo/ - ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${UNIQUENAME:S.-._.}.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/${PKGBASE:S.-._.}.conf.sample ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${DDIR} ${STAGEDIR}${DDIR} @${CHMOD} -R a-w ${STAGEDIR}${DDIR} Index: net/isc-dhcp41-server/Makefile =================================================================== --- net/isc-dhcp41-server/Makefile +++ net/isc-dhcp41-server/Makefile @@ -23,8 +23,6 @@ SUBSYS?= server WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 Index: net/isc-dhcp42-server/Makefile =================================================================== --- net/isc-dhcp42-server/Makefile +++ net/isc-dhcp42-server/Makefile @@ -25,8 +25,6 @@ SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 Index: net/isc-dhcp43-server/Makefile =================================================================== --- net/isc-dhcp43-server/Makefile +++ net/isc-dhcp43-server/Makefile @@ -25,8 +25,6 @@ SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 Index: net/openmpi/Makefile =================================================================== --- net/openmpi/Makefile +++ net/openmpi/Makefile @@ -24,7 +24,7 @@ USE_PERL5= build MPIBASE?= mpi -MPIDIR?= ${MPIBASE}/${UNIQUENAME} +MPIDIR?= ${MPIBASE}/${PKGBASE} PLIST_SUB+= MPIBASE=${MPIBASE} PLIST_SUB+= MPIDIR=${MPIDIR} Index: print/cups-base/Makefile =================================================================== --- print/cups-base/Makefile +++ print/cups-base/Makefile @@ -20,8 +20,6 @@ CONFLICTS= LPRng-[0-9]* -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - USES+= cpe gmake iconv pkgconfig tar:bzip2 CPE_VENDOR= apple DESTDIRNAME= DSTROOT @@ -53,7 +51,6 @@ GROUPS= cups USERS= cups -# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included OPTIONS_SUB= yes .if defined(CUPS_CLIENT) PORTREVISION= 2 Index: sysutils/bacula-docs/Makefile =================================================================== --- sysutils/bacula-docs/Makefile +++ sysutils/bacula-docs/Makefile @@ -13,8 +13,6 @@ NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf OPTIONS_DEFINE= DOCS Index: sysutils/bacula5-docs/Makefile =================================================================== --- sysutils/bacula5-docs/Makefile +++ sysutils/bacula5-docs/Makefile @@ -15,8 +15,6 @@ NO_BUILD= yes -UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} - PORTDOCS= *.pdf OPTIONS_DEFINE= DOCS Index: www/linux-opera/Makefile =================================================================== --- www/linux-opera/Makefile +++ www/linux-opera/Makefile @@ -31,8 +31,8 @@ OPERA_VER?= 12.16 OPERA_BUILD?= 1860 -DATADIR= ${PREFIX}/share/${UNIQUENAME} -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +DATADIR= ${PREFIX}/share/${PKGBASE} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} RENAME= opera lib/opera \ share/applications/opera-browser.desktop \ @@ -44,63 +44,63 @@ @${MV} ${WRKSRC}/share/man ${WRKSRC}/man @for _r in ${RENAME}; do \ linux=`${ECHO_CMD} $${_r} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \ done; \ for _f in `find ${WRKSRC}/share/icons -type f | \ ${SED} -e 's|${WRKSRC}/||g'`; do \ linux=`${ECHO_CMD} $${_f} | \ - ${SED} -e 's|opera|${UNIQUENAME}|g'`; \ + ${SED} -e 's|opera|${PKGBASE}|g'`; \ ${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \ done; \ for _l in `find ${WRKSRC}/share/icons -name opera-widget.png | \ ${SED} -e 's|/opera-widget\.png||g'`; do \ ${RM} $${_l}/opera-widget.png; \ cd $${_l}; \ - ${LN} -s ../mimetypes/${UNIQUENAME}-widget.png \ - $${_l}/${UNIQUENAME}-widget.png; \ + ${LN} -s ../mimetypes/${PKGBASE}-widget.png \ + $${_l}/${PKGBASE}-widget.png; \ done post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%LINUXBASE%%|${LINUXBASE}|g' \ - ${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini - @${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \ + ${WRKSRC}/share/${PKGBASE}/defaults/pluginpath.ini + @${REINPLACE_CMD} -e '/man1/s|opera|${PKGBASE}|g ; \ /man1/s|1.gz|1|g ; /man1/s|share/||g ; \ - s|bin/opera|bin/${UNIQUENAME}|g ; \ + s|bin/opera|bin/${PKGBASE}|g ; \ s|name=$$(uname -s)|name=Linux|g ; \ - s|lib/opera|lib/${UNIQUENAME}|g ; \ - s|applications/opera|applications/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - /hicolor/s|/opera|/${UNIQUENAME}|g ; \ - s|packages/opera|packages/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ + s|lib/opera|lib/${PKGBASE}|g ; \ + s|applications/opera|applications/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + /hicolor/s|/opera|/${PKGBASE}|g ; \ + s|packages/opera|packages/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \ - /OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \ - s|opera)|${UNIQUENAME})|g ; \ - s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \ + /OPERA_PERSONALDIR/s|.opera|.${PKGBASE}|g ; \ + s|opera)|${PKGBASE})|g ; \ + s|opera-widget-manager)|${PKGBASE}-widget-manager)|g ; \ s|^.*rmdir.*mime/packages.*||g ; \ s|^.*GX - bin/uninstall-opera@.*||g ; \ s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \ s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \ ${WRKSRC}/install @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \ - /Exec/s|opera|${UNIQUENAME}|g ; \ - /Icon/s|opera|${UNIQUENAME}|g ; \ - /StartupWMClass/s|opera|${UNIQUENAME}|g ; \ + /Exec/s|opera|${PKGBASE}|g ; \ + /Icon/s|opera|${PKGBASE}|g ; \ + /StartupWMClass/s|opera|${PKGBASE}|g ; \ s|TryExec=.*||g ; /^$$/d' \ ${WRKSRC}/share/applications/*.desktop - @${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \ - s|doc/opera|doc/${UNIQUENAME}|g ; \ - s|share/opera|share/${UNIQUENAME}|g ; \ - s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \ - s|opera (1)|${UNIQUENAME} (1)|g ; \ - s|\.opera@@|\.${UNIQUENAME}@@|g ; \ - s|B opera@@|B ${UNIQUENAME}@@|g ; \ - /standards-compliant/s|opera|${UNIQUENAME}|g' \ + @${REINPLACE_CMD} -e 's|lib/opera|lib/${PKGBASE}|g ; \ + s|doc/opera|doc/${PKGBASE}|g ; \ + s|share/opera|share/${PKGBASE}|g ; \ + s|opera-widget-manager|${PKGBASE}-widget-manager|g ; \ + s|opera (1)|${PKGBASE} (1)|g ; \ + s|\.opera@@|\.${PKGBASE}@@|g ; \ + s|B opera@@|B ${PKGBASE}@@|g ; \ + /standards-compliant/s|opera|${PKGBASE}|g' \ ${WRKSRC}/man/man1/*.1 - @${REINPLACE_CMD} -e '/ .if ${PORT_OPTIONS:MYOSHFUJI} Index: www/mod_myvhost/Makefile =================================================================== --- www/mod_myvhost/Makefile +++ www/mod_myvhost/Makefile @@ -15,7 +15,6 @@ MANUAL_PACKAGE_BUILD= needs apr and apache with DBD options enabled USE_APACHE= 22+ -UNIQUENAME= ${PORTNAME} PORTDOCS= changelog.html documentation.html download.html \ index.html my.css Index: www/tdiary/Makefile =================================================================== --- www/tdiary/Makefile +++ www/tdiary/Makefile @@ -48,10 +48,10 @@ SUB_LIST+= TDIARY_LANG=${TDIARY_LANG} \ TDIARY_SCRIPT=${TDIARY_SCRIPT} WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION}.1 -DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} -WWWDIR= ${PREFIX}/www/${UNIQUENAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +WWWDIR= ${PREFIX}/www/${PKGBASE} -TDIARY_SCRIPT= ${UNIQUENAME}-inst.rb +TDIARY_SCRIPT= ${PKGBASE}-inst.rb #TDIARY_LANG ja:Japanese en:English .if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja )