Branch: master

4dd12b75 2014-10-10 17:42:23 Timothy Pearson
Fix synaptic-trinity package
M debian/lenny/metapackages/synaptic-trinity/debian/postrm
M debian/lenny/metapackages/synaptic-trinity/debian/preinst
M debian/squeeze/metapackages/synaptic-trinity/debian/postrm
M debian/squeeze/metapackages/synaptic-trinity/debian/preinst
M ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
M ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/postrm b/debian/lenny/metapackages/synaptic-trinity/debian/postrm
index e6d0662..840ae09 100644
--- a/debian/lenny/metapackages/synaptic-trinity/debian/postrm
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/lenny/metapackages/synaptic-trinity/debian/preinst b/debian/lenny/metapackages/synaptic-trinity/debian/preinst
index eba99ab..dc1ddc2 100644
--- a/debian/lenny/metapackages/synaptic-trinity/debian/preinst
+++ b/debian/lenny/metapackages/synaptic-trinity/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
index e6d0662..840ae09 100644
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
index eba99ab..dc1ddc2 100644
--- a/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
+++ b/debian/squeeze/metapackages/synaptic-trinity/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
index e6d0662..840ae09 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
index eba99ab..dc1ddc2 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
+++ b/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=tdesudo-trinity
+package_name=synaptic-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
baed758a 2014-10-10 17:42:48 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
A openbsd/14.0.0/tdelibs/Makefile
A openbsd/14.0.0/tdelibs/pkg/DESCR
A openbsd/14.0.0/tdelibs/pkg/PFRAG.shared
A openbsd/14.0.0/tdelibs/pkg/PLIST
A redhat/extras/htdig/htdig.spec
M redhat/Makefile.r14
M redhat/applications/k9copy/k9copy-14.0.0.spec
M redhat/applications/kbiff/kbiff-14.0.0.spec
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/kpilot/kpilot-14.0.0.spec
M redhat/applications/ksensors/ksensors-14.0.0.spec
M redhat/build/build_rpm_package.sh
M redhat/build/get_rpm_package_name.sh
M redhat/dependencies/arts/arts-14.0.0.spec
M redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/extras/trinity-filesystem/trinity-filesystem.spec
M redhat/tdeaddons/tdeaddons-14.0.0.spec
M redhat/tdeartwork/tdeartwork-14.0.0.spec
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdelibs/tdelibs-14.0.0.spec
M redhat/tdemultimedia/tdemultimedia-14.0.0.spec
M redhat/tdevelop/tdevelop-14.0.0.spec
R redhat/3rdparty/htdig/htdig.spec
R redhat/applications/k9copy/k9copy-14.0.0-fix_author.patch
diff --git a/openbsd/14.0.0/tdelibs/Makefile b/openbsd/14.0.0/tdelibs/Makefile
new file mode 100644
index 0000000..d3c40b8
--- /dev/null
+++ b/openbsd/14.0.0/tdelibs/Makefile
@@ -0,0 +1,150 @@
+.include </usr/ports/x11/trinity/trinity.port.mk>
+
+VERSION=		${TDE_VERSION}
+REVISION=		1
+PKGNAME=		trinity-tdelibs-${VERSION}
+PREFIX=			${TDE_PREFIX}
+
+CATEGORIES=		x11/trinity
+COMMENT=		TDE Libraries
+
+MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/
+DISTNAME=		trinity-tdelibs-14.0.0~pre899+9a6735bb
+EXTRACT_SUFX=	.tar.gz
+
+RUN_DEPENDS=	devel/desktop-file-utils \
+				x11/gtk+2,-guic
+
+BUILD_DEPENDS=	devel/imake \
+				devel/gmake \
+				devel/cmake
+
+LIB_DEPENDS+=	x11/trinity/dependencies/tqtinterface,-main \
+				x11/trinity/dependencies/arts \
+				x11/trinity/dependencies/dbus-tqt \
+				x11/trinity/dependencies/dbus-1-tqt \
+				x11/trinity/dependencies/libart-lgpl
+
+LIB_DEPENDS+=	archivers/bzip2 \
+				devel/libidn \
+				devel/pcre \
+				graphics/jasper \
+				graphics/openexr \
+				graphics/tiff \
+				net/avahi \
+				print/cups \
+				print/freetype \
+				sysutils/gamin \
+				sysutils/upower \
+				textproc/aspell/core \
+				textproc/libxslt>=1.0.10
+
+SHARED_LIBS +=  DCOP                      14.0
+SHARED_LIBS +=  artskde                   1.2
+SHARED_LIBS +=  connectionmanager         0.0
+SHARED_LIBS +=  katepartinterfaces        0.0
+SHARED_LIBS +=  kglib                     0.0
+SHARED_LIBS +=  kjava                     1.0
+SHARED_LIBS +=  kjs                       1.2
+SHARED_LIBS +=  networkstatus             0.0
+SHARED_LIBS +=  tdeabc                    1.2
+SHARED_LIBS +=  tdeabc_dir                1.0
+SHARED_LIBS +=  tdeabc_file               1.0
+SHARED_LIBS +=  tdeabc_ldaptdeio          1.0
+SHARED_LIBS +=  tdeabc_net                1.0
+SHARED_LIBS +=  tdecore                   14.0
+SHARED_LIBS +=  tdednssd                  1.0
+SHARED_LIBS +=  tdefakes                  14.0
+SHARED_LIBS +=  tdefx                     14.0
+SHARED_LIBS +=  tdehtml                   14.0
+SHARED_LIBS +=  tdeimproxy                0.0
+SHARED_LIBS +=  tdeio                     14.0
+SHARED_LIBS +=  tdemdi                    1.0
+SHARED_LIBS +=  tdemdi2                   1.0
+SHARED_LIBS +=  tdemediaplayer            0.0
+SHARED_LIBS +=  tdemid                    0.0
+SHARED_LIBS +=  tdenewstuff               1.0
+SHARED_LIBS +=  tdentlm                   0.0
+SHARED_LIBS +=  tdeparts                  2.1
+SHARED_LIBS +=  tdeprint                  14.0
+SHARED_LIBS +=  tdeprint_management       14.0
+SHARED_LIBS +=  tderandr                  0.0
+SHARED_LIBS +=  tderesources              1.2
+SHARED_LIBS +=  tdersync                  0.0
+SHARED_LIBS +=  tdesasl                   1.2
+SHARED_LIBS +=  tdescreensaver            14.0
+SHARED_LIBS +=  tdescript                 0.0
+SHARED_LIBS +=  tdespell                  14.0
+SHARED_LIBS +=  tdespell2                 1.0
+SHARED_LIBS +=  tdesu                     14.0
+SHARED_LIBS +=  tdetexteditor             0.0
+SHARED_LIBS +=  tdeui                     14.0
+SHARED_LIBS +=  tdeunittest               1.0
+SHARED_LIBS +=  tdeutils                  1.2
+SHARED_LIBS +=  tdewalletbackend          1.0
+SHARED_LIBS +=  tdewalletclient           1.0
+SHARED_LIBS +=  vcard                     0.0
+
+post-patch:
+	cd ${WRKDIST}; \
+	gsed -i cmake/install_apidox \
+	        cmake/generate_apidox \
+	        kate/data/mel.xml \
+	        kdoctools/update-entities.sh \
+	        tderandr/libtderandr.cc \
+	     -e "s|/bin/bash|${LOCALBASE}/bin/bash|g"; \
+
+
+do-configure: tde-cmake-rmbuild
+	${TDE_CMAKE_CONFIGURE} \
+		-DDBUS_SYSTEM_CONF_DIRECTORY="${LOCALBASE}/share/dbus-1/system-services" \
+		\
+		-DWITH_ALL_OPTIONS=ON \
+		-DWITH_ARTS=ON \
+		-DWITH_ALSA=OFF \
+		-DWITH_LIBART=ON \
+		-DWITH_LIBIDN=ON \
+		-DWITH_SSL=ON \
+		-DWITH_CUPS=ON \
+		-DWITH_LUA=OFF \
+		-DWITH_TIFF=ON \
+		-DWITH_JASPER=ON \
+		-DWITH_OPENEXR=ON \
+		-DWITH_UTEMPTER=OFF \
+		-DWITH_ELFICON=OFF \
+		-DWITH_AVAHI=ON \
+		-DWITH_PCRE=ON \
+		-DWITH_INOTIFY=OFF \
+		-DWITH_GAMIN=ON \
+		-DWITH_TDEHWLIB=OFF \
+		-DWITH_TDEHWLIB_DAEMONS=OFF \
+		-DWITH_HAL=OFF \
+		-DWITH_DEVKITPOWER=OFF \
+		-DWITH_LOGINDPOWER=OFF \
+		-DWITH_UPOWER=ON \
+		-DWITH_UDISKS=OFF \
+		-DWITH_UDISKS2=OFF \
+		-DWITH_CONSOLEKIT=ON \
+		-DWITH_NETWORK_MANAGER_BACKEND=OFF \
+		-DWITH_SUDO_TDESU_BACKEND=OFF \
+		-DWITH_OLD_XDG_STD=OFF \
+		-DWITH_LZMA=ON \
+		-DWITH_LIBBFD=OFF \
+		-DWITH_XRANDR=ON \
+		-DWITH_XCOMPOSITE=ON \
+		-DWITH_KDE4_MENU_SUFFIX=OFF \
+		\
+		-DWITH_ASPELL=ON \
+		-DWITH_HSPELL=OFF \
+		-DWITH_TDEICONLOADER_DEBUG=OFF \
+		..
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+	# Remove setuid bit
+	chmod 0755 ${PREFIX}/bin/fileshareset
+	chmod 0755 ${PREFIX}/bin/kgrantpty
+	chmod 0755 ${PREFIX}/bin/kpac_dhcp_helper
+
+.include <bsd.port.mk>
diff --git a/openbsd/14.0.0/tdelibs/pkg/DESCR b/openbsd/14.0.0/tdelibs/pkg/DESCR
new file mode 100644
index 0000000..2c8006d
--- /dev/null
+++ b/openbsd/14.0.0/tdelibs/pkg/DESCR
@@ -0,0 +1,5 @@
+Libraries for the Trinity Desktop Environment:
+TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
+kfm (file manager), khtmlw (HTML widget), tdeio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
diff --git a/openbsd/14.0.0/tdelibs/pkg/PFRAG.shared b/openbsd/14.0.0/tdelibs/pkg/PFRAG.shared
new file mode 100644
index 0000000..eefc33a
--- /dev/null
+++ b/openbsd/14.0.0/tdelibs/pkg/PFRAG.shared
 ** Diff limit reached (max: 250 lines) **